Skip to content

pidan / FuSiLive

Go to a project
Commit 237ce6bf by suolong
Options

提交bug问题

parent 0bfac6a3
Inline Side-by-side
Showing with 13 additions and 24 deletions
Modules/FUSShowRoomModule/FUSShowRoomModule.xcodeproj/project.pbxproj
......@@ -1163,7 +1163,7 @@
3E4DC89A2F580A46003070EC /* live_link_mic_boy_speak_anim.webp in Resources */ = {isa = PBXBuildFile; fileRef = 3E4DC8982F580A46003070EC /* live_link_mic_boy_speak_anim.webp */; };
3E4DC89B2F580A46003070EC /* live_link_mic_girl_speak_anim.webp in Resources */ = {isa = PBXBuildFile; fileRef = 3E4DC8992F580A46003070EC /* live_link_mic_girl_speak_anim.webp */; };
3E50054E2F556DC300058145 /* FUSLiveRTCData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E50054D2F556DC300058145 /* FUSLiveRTCData.swift */; };
3E5C39BF2FD7FA2800F48D36 /* TTSDKLisenceFileForNew in Resources */ = {isa = PBXBuildFile; fileRef = 3E5C39BE2FD7FA2800F48D36 /* TTSDKLisenceFileForNew */; };
3E84E8622FD9103200815647 /* TTSDKLisenceFile in Resources */ = {isa = PBXBuildFile; fileRef = 3E84E8612FD9103200815647 /* TTSDKLisenceFile */; };
3ED4D5C42F7BB15D00C17B8E /* fus_home_navi_startLive2_animate.webp in Resources */ = {isa = PBXBuildFile; fileRef = 3ED4D5C32F7BB15D00C17B8E /* fus_home_navi_startLive2_animate.webp */; };
7C2A1F1A3A1D4D2C9A0B1C2D /* FUSPayRoomCompanionDataModel.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C2A1F0B3A1D4D2C9A0B1C2D /* FUSPayRoomCompanionDataModel.h */; };
7C2A1F1B3A1D4D2C9A0B1C2D /* FUSPayRoomCompanionDataModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 7C2A1F0C3A1D4D2C9A0B1C2D /* FUSPayRoomCompanionDataModel.m */; };
......@@ -1818,7 +1818,6 @@
BED65C702C60C5D400668116 /* FUSShowRoomCenterBunble.m in Sources */ = {isa = PBXBuildFile; fileRef = BED65C6D2C60C5D400668116 /* FUSShowRoomCenterBunble.m */; };
BED65C722C60C61C00668116 /* FUSShowRoomAssets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BED65C712C60C61C00668116 /* FUSShowRoomAssets.xcassets */; };
BED65CFF2C62148700668116 /* TTSDKLisenceFileForTest in Resources */ = {isa = PBXBuildFile; fileRef = BED65CFD2C62148700668116 /* TTSDKLisenceFileForTest */; };
BED65D002C62148700668116 /* TTSDKLisenceFile in Resources */ = {isa = PBXBuildFile; fileRef = BED65CFE2C62148700668116 /* TTSDKLisenceFile */; };
BEEAB2532D3380FA008CD059 /* FusAnchorRewardView.h in Headers */ = {isa = PBXBuildFile; fileRef = BEEAB2512D3380FA008CD059 /* FusAnchorRewardView.h */; };
BEEAB2542D3380FA008CD059 /* FusAnchorRewardView.m in Sources */ = {isa = PBXBuildFile; fileRef = BEEAB2522D3380FA008CD059 /* FusAnchorRewardView.m */; };
BEEAB2632D34CC60008CD059 /* FUSLiveStartSetPrivacyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEEAB2612D34CC60008CD059 /* FUSLiveStartSetPrivacyView.swift */; };
......@@ -3577,7 +3576,7 @@
3E4DC8982F580A46003070EC /* live_link_mic_boy_speak_anim.webp */ = {isa = PBXFileReference; lastKnownFileType = file; path = live_link_mic_boy_speak_anim.webp; sourceTree = "<group>"; };
3E4DC8992F580A46003070EC /* live_link_mic_girl_speak_anim.webp */ = {isa = PBXFileReference; lastKnownFileType = file; path = live_link_mic_girl_speak_anim.webp; sourceTree = "<group>"; };
3E50054D2F556DC300058145 /* FUSLiveRTCData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLiveRTCData.swift; sourceTree = "<group>"; };
3E5C39BE2FD7FA2800F48D36 /* TTSDKLisenceFileForNew */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TTSDKLisenceFileForNew; sourceTree = "<group>"; };
3E84E8612FD9103200815647 /* TTSDKLisenceFile */ = {isa = PBXFileReference; lastKnownFileType = text; path = TTSDKLisenceFile; sourceTree = "<group>"; };
3ED4D5C32F7BB15D00C17B8E /* fus_home_navi_startLive2_animate.webp */ = {isa = PBXFileReference; lastKnownFileType = file; path = fus_home_navi_startLive2_animate.webp; sourceTree = "<group>"; };
549D669035746701FD4C7ADC /* FUSLiveGiftInteractOptionModel.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = FUSLiveGiftInteractOptionModel.m; sourceTree = "<group>"; };
7C2A1F0B3A1D4D2C9A0B1C2D /* FUSPayRoomCompanionDataModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FUSPayRoomCompanionDataModel.h; sourceTree = "<group>"; };
......@@ -4240,7 +4239,6 @@
BED65C6D2C60C5D400668116 /* FUSShowRoomCenterBunble.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FUSShowRoomCenterBunble.m; sourceTree = "<group>"; };
BED65C712C60C61C00668116 /* FUSShowRoomAssets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = FUSShowRoomAssets.xcassets; sourceTree = "<group>"; };
BED65CFD2C62148700668116 /* TTSDKLisenceFileForTest */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TTSDKLisenceFileForTest; sourceTree = "<group>"; };
BED65CFE2C62148700668116 /* TTSDKLisenceFile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TTSDKLisenceFile; sourceTree = "<group>"; };
BEEAB2512D3380FA008CD059 /* FusAnchorRewardView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FusAnchorRewardView.h; sourceTree = "<group>"; };
BEEAB2522D3380FA008CD059 /* FusAnchorRewardView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FusAnchorRewardView.m; sourceTree = "<group>"; };
BEEAB2552D34CC60008CD059 /* FUSLiveStartBeautyFavoritesEditView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLiveStartBeautyFavoritesEditView.swift; sourceTree = "<group>"; };
......@@ -6701,9 +6699,8 @@
isa = PBXGroup;
children = (
BEF675F02C6B156500A670FB /* Resources */,
BED65CFE2C62148700668116 /* TTSDKLisenceFile */,
BE4096BE2C7C37EF00CE2FE8 /* Info.plist */,
3E5C39BE2FD7FA2800F48D36 /* TTSDKLisenceFileForNew */,
3E84E8612FD9103200815647 /* TTSDKLisenceFile */,
BED65CFD2C62148700668116 /* TTSDKLisenceFileForTest */,
BED65C712C60C61C00668116 /* FUSShowRoomAssets.xcassets */,
);
......@@ -9991,7 +9988,6 @@
BEF676A42C6B156600A670FB /* live_treasure_box_light_bg_5@2x.png in Resources */,
BED65B6F2C5CE67100668116 /* FUSVideoEndView.xib in Resources */,
BEF677392C6B156600A670FB /* PK_Start_Animation_6@2x.png in Resources */,
3E5C39BF2FD7FA2800F48D36 /* TTSDKLisenceFileForNew in Resources */,
BEF678032C6B156600A670FB /* live_minimize_anim_21@2x.png in Resources */,
BEF677B62C6B156600A670FB /* PKAnchorPicBorderAnimation_11@2x.png in Resources */,
BEF678042C6B156600A670FB /* live_minimize_anim_22@2x.png in Resources */,
......@@ -10143,7 +10139,6 @@
BEF6774E2C6B156600A670FB /* PK_Win_Animation_01@2x.png in Resources */,
BEF675FD2C6B156500A670FB /* 1_First_Kill_Animation_13@3x.png in Resources */,
BEF677382C6B156600A670FB /* PK_Start_Animation_5@2x.png in Resources */,
BED65D002C62148700668116 /* TTSDKLisenceFile in Resources */,
BEF6774A2C6B156600A670FB /* PK_Start_Animation_23@2x.png in Resources */,
BEF676672C6B156500A670FB /* live_bullet_fluorescence_anim_14@2x.png in Resources */,
BEF6764E2C6B156500A670FB /* common_broadcast_purple_type_bg_6@2x.png in Resources */,
......@@ -10197,6 +10192,7 @@
BEF677DE2C6B156600A670FB /* live_head_follow_btn_anim_5@2x.png in Resources */,
BEF677632C6B156600A670FB /* PK_Win_Animation_22@2x.png in Resources */,
BEF677FC2C6B156600A670FB /* live_minimize_anim_14@2x.png in Resources */,
3E84E8622FD9103200815647 /* TTSDKLisenceFile in Resources */,
BEF677462C6B156600A670FB /* PK_Start_Animation_19@2x.png in Resources */,
BEF677672C6B156600A670FB /* PK_Win_Animation_26@2x.png in Resources */,
BEF677642C6B156600A670FB /* PK_Win_Animation_23@2x.png in Resources */,
Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/TTSDKLisenceFile
{
"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"
}
"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/FUSShowRoomBundle.bundle/TTSDKLisenceFileForNew deleted 100644 → 0
{
"Signature": "mms6/tN93QinEnspSc+o1xKS5oXIbGU5B3h6iUvbKC1fgznjHo55eZucGqkxNEUqzvPo36tRcsd9k6dNaS7cyuQNPwEsFP3gWnsMSEXT9p3aFNkhRbzkz9a3Yuxm5lVrhdXsXsMGdwjb4tgtt1J9Ncecsh4KaSH7N91jH1cWQBcPJed0AFV0U+l6mUOuFSNveVet5aPNCMrtz05GpNzI1nEe4Kf23tUkyvCWtKtwxDYS/Bx+G7L2edca05Zh19Kd0A9l9+WsuRTu4PrcPKnDTbM+hzQbcc+5hUYhiTNkv+GNpX5h4h34H4PzVIvmxtZICGSODhVXb/iEMJga1mj6Mw==",
"Content": "eyJJZCI6Ijk4MDMwMjMzOCIsIlZlcnNpb24iOjIsIkNoYW5uZWwiOiJsaXZlIiwiVHlwZSI6MiwiQnVuZGxlSWQiOiJjb20uZnVzaS5tZWV0LmxpdmUuY2hhdC52aWRlby5hbW9uZy5mcmllbmRzIiwiTW9kdWxlcyI6W3siTmFtZSI6ImxpdmVfcHVzaCIsIkVkaXRpb24iOiJwcmVtaXVtX2VkaXRpb24iLCJTdGFydFRpbWUiOjE3MjQ0MDMwODYyMjYsIkV4cGlyZVRpbWUiOjE3ODc0NzUwODYyMjYsIkV4cGlyZUJ1ZmZlciI6MTU1NTIwMDAwMDB9LHsiTmFtZSI6ImxpdmVfcHVsbCIsIkVkaXRpb24iOiJwcmVtaXVtX2VkaXRpb24iLCJTdGFydFRpbWUiOjE3MjQ0MDMwODYyMjYsIkV4cGlyZVRpbWUiOjE3ODc0NzUwODYyMjYsIkV4cGlyZUJ1ZmZlciI6MTU1NTIwMDAwMDB9XSwiRmlsZVZlcnNpb24iOiIxNzU1NTA5MzcyMTEyNjE2NTc2In0=",
"MainURL": "https://vod-license-m.volccdn.com/vod-license/l-980302338-ch-live-a-642006.lic?lk3s=0d9f7a7d&x-expires=4909109372&x-signature=%2FuukAMeJkYi5QuJr%2BJzqCjGf3kk%3D",
"BackupURL": "https://vod-license-b.volccdn.com/vod-license/l-980302338-ch-live-a-642006.lic?lk3s=0d9f7a7d&x-expires=4909109372&x-signature=kYXzogOqCgLadzxk%2BcP5TwbRMio%3D",
"Id": "980302338"
}
\ No newline at end of file
Modules/FUSShowRoomModule/FUSShowRoomModule/Router/FUSShowRoomRouter.m
......@@ -780,11 +780,11 @@
NSString *formalBundleIdentifier = @"com.fusi.meet.live.chat.video.among.friends";
// 根据系统当前包名判断播放器配置，正式包走正式 license 与 appid。
BOOL useFormalTTSDKConfig = [currentBundleIdentifier isEqualToString:formalBundleIdentifier];
NSInteger appId = useFormalTTSDKConfig ? 642006 : 100667;
NSInteger appId = useFormalTTSDKConfig ? 642642 : 100667;
NSString *appname = FUSConfig.sharedInstanced.appConfigs.appName;
NSString *channel = [FUSDeviceHelper fus_getChannelId];
NSString *bundleID = currentBundleIdentifier;
NSString *lisenceFilePath = useFormalTTSDKConfig ? @"TTSDKLisenceFileForNew" : @"TTSDKLisenceFileForTest";
NSString *lisenceFilePath = useFormalTTSDKConfig ? @"TTSDKLisenceFile" : @"TTSDKLisenceFileForTest";
TTSDKConfiguration *configuration = [TTSDKConfiguration defaultConfigurationWithAppID:@(appId).description];
configuration.appName = appname;
......
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