Skip to content

Commit 89c35d0

Browse files
author
carolsuo
committed
修复小直播编译问题
1 parent 950fbb3 commit 89c35d0

File tree

2 files changed

+43
-4
lines changed

2 files changed

+43
-4
lines changed

‎iOS/XiaoZhiBo/XiaoZhiBoApp.xcodeproj/project.pbxproj

Lines changed: 37 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,12 @@
6363
45B1125C2289B8030085AEEC /* TXLiteAVSDK_Smart.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 45B1125B2289B8030085AEEC /* TXLiteAVSDK_Smart.framework */; };
6464
45B26D91228BC0D000CBA8B0 /* TXLiteAVSDK_Smart.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 45B26D90228BC0D000CBA8B0 /* TXLiteAVSDK_Smart.framework */; };
6565
91479BC61E70FD39007ECCEB /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 91479BC51E70FD39007ECCEB /* Accelerate.framework */; };
66+
A065F79F2369434E002906F3 /* GenerateTestUserSig.m in Sources */ = {isa = PBXBuildFile; fileRef = A065F79D2369434E002906F3 /* GenerateTestUserSig.m */; };
67+
A065F7A5236943EE002906F3 /* QCloudCOSXML.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A065F7A2236943ED002906F3 /* QCloudCOSXML.framework */; };
68+
A065F7A6236943EE002906F3 /* ImSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A065F7A3236943ED002906F3 /* ImSDK.framework */; };
69+
A065F7A7236943EE002906F3 /* QCloudCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A065F7A4236943EE002906F3 /* QCloudCore.framework */; };
70+
A065F7A923694418002906F3 /* Bugly.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A065F7A823694418002906F3 /* Bugly.framework */; };
71+
A065F7AA23694439002906F3 /* ImSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = A065F7A3236943ED002906F3 /* ImSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
6672
B732EBB41D7C593C006E6FA0 /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = B732EBB31D7C593C006E6FA0 /* libresolv.tbd */; };
6773
D8D256811261DF4C40C7748A /* libPods-XiaoZhiBoApp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 894E4A2363E21E853A1F9757 /* libPods-XiaoZhiBoApp.a */; };
6874
EF47CE5B1D4B1ED60028B598 /* libstdc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = EF47CE5A1D4B1ED60028B598 /* libstdc++.tbd */; };
@@ -531,6 +537,7 @@
531537
dstPath = "";
532538
dstSubfolderSpec = 10;
533539
files = (
540+
A065F7AA23694439002906F3 /* ImSDK.framework in Embed Frameworks */,
534541
);
535542
name = "Embed Frameworks";
536543
runOnlyForDeploymentPostprocessing = 0;
@@ -668,14 +675,21 @@
668675
91BA6E5B1F2721F4008700CF /* TXLiteAVSDK.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = TXLiteAVSDK.xcodeproj; path = ../../sdk/liteav/TXLiteAVSDK.xcodeproj; sourceTree = "<group>"; };
669676
91BA6E871F27229C008700CF /* TXLiteAVSDK.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = TXLiteAVSDK.xcodeproj; path = ../../sdk/liteav/TXLiteAVSDK.xcodeproj; sourceTree = "<group>"; };
670677
952A710DCB72E0868862BDB4 /* Pods-XiaoZhiBoApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-XiaoZhiBoApp.debug.xcconfig"; path = "Pods/Target Support Files/Pods-XiaoZhiBoApp/Pods-XiaoZhiBoApp.debug.xcconfig"; sourceTree = "<group>"; };
678+
A065F799236942D5002906F3 /* TCConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TCConfig.h; sourceTree = "<group>"; };
679+
A065F79D2369434E002906F3 /* GenerateTestUserSig.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GenerateTestUserSig.m; sourceTree = "<group>"; };
680+
A065F79E2369434E002906F3 /* GenerateTestUserSig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GenerateTestUserSig.h; sourceTree = "<group>"; };
681+
A065F7A0236943A9002906F3 /* Podfile */ = {isa = PBXFileReference; lastKnownFileType = text; path = Podfile; sourceTree = "<group>"; };
682+
A065F7A2236943ED002906F3 /* QCloudCOSXML.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QCloudCOSXML.framework; path = ../SDK/QCloudCOSXML.framework; sourceTree = "<group>"; };
683+
A065F7A3236943ED002906F3 /* ImSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ImSDK.framework; path = ../SDK/ImSDK.framework; sourceTree = "<group>"; };
684+
A065F7A4236943EE002906F3 /* QCloudCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QCloudCore.framework; path = ../SDK/QCloudCore.framework; sourceTree = "<group>"; };
685+
A065F7A823694418002906F3 /* Bugly.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Bugly.framework; path = ../SDK/Bugly.framework; sourceTree = "<group>"; };
671686
B732EBB31D7C593C006E6FA0 /* libresolv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libresolv.tbd; path = usr/lib/libresolv.tbd; sourceTree = SDKROOT; };
672687
EF47CE281D4B03FC0028B598 /* XiaoZhiBoApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = XiaoZhiBoApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
673688
EF47CE5A1D4B1ED60028B598 /* libstdc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libstdc++.tbd"; path = "usr/lib/libstdc++.tbd"; sourceTree = SDKROOT; };
674689
EF47CE5C1D4B1EE10028B598 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
675690
EF47CE5E1D4B1F5D0028B598 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
676691
EF47CE601D4B1F8B0028B598 /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; };
677692
EF47CE621D4B1F9D0028B598 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
678-
EF47CED21D4B28120028B598 /* Bugly.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Bugly.framework; path = XiaoZhiBoApp/Framework/Bugly.framework; sourceTree = "<group>"; };
679693
EF47CEDE1D4B28340028B598 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; };
680694
F4ECE3C5B38BD4FC3E4533D9 /* Pods-XiaoZhiBoApp.dailybuild.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-XiaoZhiBoApp.dailybuild.xcconfig"; path = "Pods/Target Support Files/Pods-XiaoZhiBoApp/Pods-XiaoZhiBoApp.dailybuild.xcconfig"; sourceTree = "<group>"; };
681695
/* End PBXFileReference section */
@@ -688,14 +702,18 @@
688702
4553C6F52272FE1B008544F7 /* AssetsLibrary.framework in Frameworks */,
689703
91479BC61E70FD39007ECCEB /* Accelerate.framework in Frameworks */,
690704
B732EBB41D7C593C006E6FA0 /* libresolv.tbd in Frameworks */,
705+
A065F7A7236943EE002906F3 /* QCloudCore.framework in Frameworks */,
706+
A065F7A6236943EE002906F3 /* ImSDK.framework in Frameworks */,
691707
EF47CEDF1D4B28340028B598 /* libsqlite3.tbd in Frameworks */,
692708
45B26D91228BC0D000CBA8B0 /* TXLiteAVSDK_Smart.framework in Frameworks */,
709+
A065F7A5236943EE002906F3 /* QCloudCOSXML.framework in Frameworks */,
693710
45B1125C2289B8030085AEEC /* TXLiteAVSDK_Smart.framework in Frameworks */,
694711
EF47CE631D4B1F9D0028B598 /* SystemConfiguration.framework in Frameworks */,
695712
EF47CE611D4B1F8B0028B598 /* CoreTelephony.framework in Frameworks */,
696713
EF47CE5F1D4B1F5D0028B598 /* libz.tbd in Frameworks */,
697714
EF47CE5D1D4B1EE10028B598 /* AVFoundation.framework in Frameworks */,
698715
EF47CE5B1D4B1ED60028B598 /* libstdc++.tbd in Frameworks */,
716+
A065F7A923694418002906F3 /* Bugly.framework in Frameworks */,
699717
D8D256811261DF4C40C7748A /* libPods-XiaoZhiBoApp.a in Frameworks */,
700718
);
701719
runOnlyForDeploymentPostprocessing = 0;
@@ -794,6 +812,7 @@
794812
4568105A22A9076C001A08E1 /* App */ = {
795813
isa = PBXGroup;
796814
children = (
815+
A065F799236942D5002906F3 /* TCConfig.h */,
797816
4568105B22A9076C001A08E1 /* AppDelegate.h */,
798817
4568105D22A9076C001A08E1 /* AppDelegate.m */,
799818
4568105C22A9076C001A08E1 /* TCGlobalConfig.h */,
@@ -936,6 +955,7 @@
936955
45784C722272E3E500A5F2BA /* LiveRoom */ = {
937956
isa = PBXGroup;
938957
children = (
958+
A065F79C2369434E002906F3 /* Debug */,
939959
45784C732272E3E500A5F2BA /* RoomUtil */,
940960
45784C7B2272E3E500A5F2BA /* LiveRoom */,
941961
);
@@ -1078,6 +1098,15 @@
10781098
name = Products;
10791099
sourceTree = "<group>";
10801100
};
1101+
A065F79C2369434E002906F3 /* Debug */ = {
1102+
isa = PBXGroup;
1103+
children = (
1104+
A065F79D2369434E002906F3 /* GenerateTestUserSig.m */,
1105+
A065F79E2369434E002906F3 /* GenerateTestUserSig.h */,
1106+
);
1107+
path = Debug;
1108+
sourceTree = "<group>";
1109+
};
10811110
B49FE0366F1F0A7CBF2E06AF /* Pods */ = {
10821111
isa = PBXGroup;
10831112
children = (
@@ -1091,12 +1120,16 @@
10911120
B80923DF28B8CAEB7F2FD31B /* Frameworks */ = {
10921121
isa = PBXGroup;
10931122
children = (
1123+
A065F7A823694418002906F3 /* Bugly.framework */,
1124+
A065F7A3236943ED002906F3 /* ImSDK.framework */,
1125+
A065F7A4236943EE002906F3 /* QCloudCore.framework */,
1126+
A065F7A2236943ED002906F3 /* QCloudCOSXML.framework */,
1127+
A065F7A0236943A9002906F3 /* Podfile */,
10941128
45B26D90228BC0D000CBA8B0 /* TXLiteAVSDK_Smart.framework */,
10951129
4553C6F42272FE1B008544F7 /* AssetsLibrary.framework */,
10961130
EF47CE5E1D4B1F5D0028B598 /* libz.tbd */,
10971131
EF47CEDE1D4B28340028B598 /* libsqlite3.tbd */,
10981132
EF47CE5A1D4B1ED60028B598 /* libstdc++.tbd */,
1099-
EF47CED21D4B28120028B598 /* Bugly.framework */,
11001133
EF47CE621D4B1F9D0028B598 /* SystemConfiguration.framework */,
11011134
EF47CE601D4B1F8B0028B598 /* CoreTelephony.framework */,
11021135
EF47CE5C1D4B1EE10028B598 /* AVFoundation.framework */,
@@ -1714,7 +1747,7 @@
17141747
);
17151748
runOnlyForDeploymentPostprocessing = 0;
17161749
shellPath = /bin/sh;
1717-
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\nif [ ! -e \"${PROJECT_DIR}/../SDK/TXLiteAVSDK_Smart.framework\" ]; then\nURL=\"$(cat ../SDK/README.md | grep -o 'http.*zip')\"\ncurl \"$URL\" --output ${PROJECT_DIR}/../SDK/TXLiteAVSDK_Smart_iOS.zip\ncd ${PROJECT_DIR}/../SDK\nunzip TXLiteAVSDK_Smart_iOS.zip\nmv TXLiteAVSDK_Smart_*/SDK/*.framework .\nrm -rf TXLiteAVSDK_Smart_*\nfi\n";
1750+
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\nif [ ! -e \"${PROJECT_DIR}/../SDK/TXLiteAVSDK_Smart.framework\" ]; then\nURL=\"$(cat ../SDK/README.md | grep -o 'http.*zip')\"\ncurl \"$URL\" --output ${PROJECT_DIR}/../SDK/TXLiteAVSDK_Smart_iOS.zip\ncd ${PROJECT_DIR}/../SDK\nunzip TXLiteAVSDK_Smart_iOS.zip\nmv TXLiteAVSDK_Smart_*/SDK/*.framework .\nrm -rf TXLiteAVSDK_Smart_*\nfi\n\nif [ ! -e \"${PROJECT_DIR}/../SDK/ImSDK.framework\" ]; then\nURL=\"https://pod-1252463788.cos.ap-guangzhou.myqcloud.com/mlvbspec/ImSDK/ImSDK.framework.zip\"\ncurl \"$URL\" --output ${PROJECT_DIR}/../SDK/ImSDK.framework.zip\ncd ${PROJECT_DIR}/../SDK\nunzip ImSDK.framework.zip\nrm -rf ImSDK.framework.zip\nrm -rf __MACOSX\nfi\n\nif [ ! -e \"${PROJECT_DIR}/../SDK/Bugly.framework\" ]; then\nURL=\"https://pod-1252463788.cos.ap-guangzhou.myqcloud.com/mlvbspec/Bugly/Bugly.framework.zip\"\ncurl \"$URL\" --output ${PROJECT_DIR}/../SDK/Bugly.framework.zip\ncd ${PROJECT_DIR}/../SDK\nunzip Bugly.framework.zip\nrm -rf Bugly.framework.zip\nfi\n\nif [ ! -e \"${PROJECT_DIR}/../SDK/QCloudCOSXML.framework\" ]; then\nURL=\"https://pod-1252463788.cos.ap-guangzhou.myqcloud.com/mlvbspec/COS/QCloudCOSXML.framework.zip\"\ncurl \"$URL\" --output ${PROJECT_DIR}/../SDK/QCloudCOSXML.framework.zip\ncd ${PROJECT_DIR}/../SDK\nunzip QCloudCOSXML.framework.zip\nrm -rf QCloudCOSXML.framework.zip\nfi\n\nif [ ! -e \"${PROJECT_DIR}/../SDK/QCloudCore.framework\" ]; then\nURL=\"https://pod-1252463788.cos.ap-guangzhou.myqcloud.com/mlvbspec/COS/QCloudCore.framework.zip\"\ncurl \"$URL\" --output ${PROJECT_DIR}/../SDK/QCloudCore.framework.zip\ncd ${PROJECT_DIR}/../SDK\nunzip QCloudCore.framework.zip\nrm -rf QCloudCore.framework.zip\nfi\n\n\n";
17181751
};
17191752
BF020143BA8816A0EFA61A96 /* [CP] Copy Pods Resources */ = {
17201753
isa = PBXShellScriptBuildPhase;
@@ -1813,6 +1846,7 @@
18131846
456810A622A9076C001A08E1 /* AppDelegate.m in Sources */,
18141847
45784EF82272E3E700A5F2BA /* IMMsgManager.m in Sources */,
18151848
4568109E22A9076C001A08E1 /* TCAudienceViewController.m in Sources */,
1849+
A065F79F2369434E002906F3 /* GenerateTestUserSig.m in Sources */,
18161850
456810AC22A9076C001A08E1 /* TCPlayBackViewController.m in Sources */,
18171851
456810A322A9076C001A08E1 /* TCMsgListTableView.m in Sources */,
18181852
456810AD22A9076C001A08E1 /* UIColor+MLPFlatColors.m in Sources */,

‎iOS/XiaoZhiBo/XiaoZhiBoApp.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
4-
<dict/>
4+
<dict>
5+
<key>BuildSystemType</key>
6+
<string>Original</string>
7+
<key>PreviewsEnabled</key>
8+
<false/>
9+
</dict>
510
</plist>

0 commit comments

Comments
 (0)