Skip to content

Commit

Permalink
【iOS/Mac】 demo调整会cocoapod方式引用SDK
Browse files Browse the repository at this point in the history
  • Loading branch information
@rstru
rstru committed Aug 8, 2019
1 parent a4b4aa8 commit e04a516
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 40 deletions.
6 changes: 6 additions & 0 deletions Mac/Podfile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
platform :osx, '10.10'

target 'TRTCDemo' do
# pod 'TXLiteAVSDK_TRTC_Mac', :podspec => 'http://pod-1252463788.cosgz.myqcloud.com/liteavsdkspec/TXLiteAVSDK_TRTC_Mac.podspec'
pod 'TXLiteAVSDK_TRTC_Mac'
end
24 changes: 4 additions & 20 deletions Mac/TRTCDemo.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,14 @@
45AD957121D6532C007B2EAF /* TRTCSettingWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 45AD956821D6532B007B2EAF /* TRTCSettingWindowController.xib */; };
45AD957221D6532C007B2EAF /* HoverView.m in Sources */ = {isa = PBXBuildFile; fileRef = 45AD956B21D6532B007B2EAF /* HoverView.m */; };
45AD957321D6532C007B2EAF /* TRTCSettingWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 45AD956E21D6532C007B2EAF /* TRTCSettingWindowController.m */; };
45AD957721D653FB007B2EAF /* config.json in Resources */ = {isa = PBXBuildFile; fileRef = 45AD957621D653FA007B2EAF /* config.json */; };
45AD957B21D656C2007B2EAF /* TRTCMainWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 45AD957921D656C2007B2EAF /* TRTCMainWindowController.xib */; };
45AD95BF21D72C0F007B2EAF /* TRTCMainWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 45AD95BE21D72C0F007B2EAF /* TRTCMainWindowController.m */; };
45F96FC9223296E600E861EC /* TRTCApp.m in Sources */ = {isa = PBXBuildFile; fileRef = 45F96FC7223296E600E861EC /* TRTCApp.m */; };
D689A93121CC97F300C7C618 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = D689A93021CC97F300C7C618 /* AppDelegate.m */; };
D689A93621CC97F400C7C618 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D689A93521CC97F400C7C618 /* Assets.xcassets */; };
D689A93921CC97F400C7C618 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D689A93721CC97F400C7C618 /* Main.storyboard */; };
D689A93C21CC97F400C7C618 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = D689A93B21CC97F400C7C618 /* main.m */; };
D689A96821CCADD700C7C618 /* TXLiteAVSDK_TRTC_Mac.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D689A96721CCADD700C7C618 /* TXLiteAVSDK_TRTC_Mac.framework */; };
D689A98121CCC41200C7C618 /* TXRenderView.m in Sources */ = {isa = PBXBuildFile; fileRef = D689A97921CCC41100C7C618 /* TXRenderView.m */; };
D689A99A21CCC6E700C7C618 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D689A99921CCC6E700C7C618 /* libc++.tbd */; };
D689A99C21CCC70100C7C618 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D689A99B21CCC70100C7C618 /* AudioUnit.framework */; };
D697C3C122F3164100E80A2A /* GenerateTestUserSig.m in Sources */ = {isa = PBXBuildFile; fileRef = D697C3C022F3164100E80A2A /* GenerateTestUserSig.m */; };
/* End PBXBuildFile section */

Expand All @@ -55,7 +51,6 @@
45AD956B21D6532B007B2EAF /* HoverView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HoverView.m; sourceTree = "<group>"; };
45AD956C21D6532B007B2EAF /* TRTCSettingWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TRTCSettingWindowController.h; sourceTree = "<group>"; };
45AD956E21D6532C007B2EAF /* TRTCSettingWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TRTCSettingWindowController.m; sourceTree = "<group>"; };
45AD957621D653FA007B2EAF /* config.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = config.json; sourceTree = "<group>"; };
45AD957821D656C2007B2EAF /* TRTCMainWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TRTCMainWindowController.h; sourceTree = "<group>"; };
45AD957921D656C2007B2EAF /* TRTCMainWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = TRTCMainWindowController.xib; sourceTree = "<group>"; };
45AD95BE21D72C0F007B2EAF /* TRTCMainWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TRTCMainWindowController.m; sourceTree = "<group>"; };
Expand All @@ -69,11 +64,8 @@
D689A93A21CC97F400C7C618 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
D689A93B21CC97F400C7C618 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
D689A93D21CC97F400C7C618 /* TRTCDemo.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = TRTCDemo.entitlements; sourceTree = "<group>"; };
D689A96721CCADD700C7C618 /* TXLiteAVSDK_TRTC_Mac.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = TXLiteAVSDK_TRTC_Mac.framework; path = SDK/TXLiteAVSDK_TRTC_Mac.framework; sourceTree = "<group>"; };
D689A97821CCC41100C7C618 /* TXRenderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TXRenderView.h; sourceTree = "<group>"; };
D689A97921CCC41100C7C618 /* TXRenderView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TXRenderView.m; sourceTree = "<group>"; };
D689A99921CCC6E700C7C618 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
D689A99B21CCC70100C7C618 /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = System/Library/Frameworks/AudioUnit.framework; sourceTree = SDKROOT; };
D697C3BF22F3164100E80A2A /* GenerateTestUserSig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GenerateTestUserSig.h; sourceTree = "<group>"; };
D697C3C022F3164100E80A2A /* GenerateTestUserSig.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GenerateTestUserSig.m; sourceTree = "<group>"; };
/* End PBXFileReference section */
Expand All @@ -83,9 +75,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
D689A99C21CCC70100C7C618 /* AudioUnit.framework in Frameworks */,
D689A99A21CCC6E700C7C618 /* libc++.tbd in Frameworks */,
D689A96821CCADD700C7C618 /* TXLiteAVSDK_TRTC_Mac.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -140,7 +129,6 @@
isa = PBXGroup;
children = (
457A700022006BEC00DD193B /* SDKHeader.h */,
45AD957621D653FA007B2EAF /* config.json */,
D689A92F21CC97F300C7C618 /* AppDelegate.h */,
D689A93021CC97F300C7C618 /* AppDelegate.m */,
D689A95221CC9AE400C7C618 /* TRTC */,
Expand Down Expand Up @@ -179,9 +167,6 @@
D689A96621CCADD600C7C618 /* Frameworks */ = {
isa = PBXGroup;
children = (
D689A99B21CCC70100C7C618 /* AudioUnit.framework */,
D689A99921CCC6E700C7C618 /* libc++.tbd */,
D689A96721CCADD700C7C618 /* TXLiteAVSDK_TRTC_Mac.framework */,
);
name = Frameworks;
sourceTree = "<group>";
Expand Down Expand Up @@ -260,7 +245,6 @@
D689A93621CC97F400C7C618 /* Assets.xcassets in Resources */,
457A707E2200814E00DD193B /* TXCaptureSourceWindowController.xib in Resources */,
45AD957B21D656C2007B2EAF /* TRTCMainWindowController.xib in Resources */,
45AD957721D653FB007B2EAF /* config.json in Resources */,
453167F321E45560007A91CB /* TRTCNewWindowController.xib in Resources */,
45AD957121D6532C007B2EAF /* TRTCSettingWindowController.xib in Resources */,
D689A93921CC97F400C7C618 /* Main.storyboard in Resources */,
Expand Down Expand Up @@ -427,8 +411,8 @@
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = "";
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/SDK";
HEADER_SEARCH_PATHS = "\"$(SRCROOT)/SDK/TXLiteAVSDK_TRTC_Mac.framework/Headers\"";
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
HEADER_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = TRTCDemo/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -453,8 +437,8 @@
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = "";
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/SDK";
HEADER_SEARCH_PATHS = "\"$(SRCROOT)/SDK/TXLiteAVSDK_TRTC_Mac.framework/Headers\"";
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
HEADER_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = TRTCDemo/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
Expand Down
1 change: 0 additions & 1 deletion Mac/TRTCDemo/config.json
View file

This file was deleted.

10 changes: 10 additions & 0 deletions iOS/Podfile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
source 'https://github.com/CocoaPods/Specs.git'

platform :ios, '8.0'

target 'TRTCDemo' do

pod 'TXLiteAVSDK_TRTC'
#pod 'TXLiteAVSDK_TRTC', :podspec => 'http://pod-1252463788.cosgz.myqcloud.com/liteavsdkspec/TXLiteAVSDK_TRTC.podspec'

end
24 changes: 6 additions & 18 deletions iOS/TRTCDemo.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
918EFF7D21D727C3007CF83A /* TRTCMainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 918EFF7821D727C3007CF83A /* TRTCMainViewController.m */; };
918EFF7E21D727C3007CF83A /* TRTCVideoViewLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = 918EFF7B21D727C3007CF83A /* TRTCVideoViewLayout.m */; };
918EFF8221D727DC007CF83A /* MBProgressHUD.m in Sources */ = {isa = PBXBuildFile; fileRef = 918EFF8121D727DC007CF83A /* MBProgressHUD.m */; };
918EFFED21D79A2E007CF83A /* config.json in Resources */ = {isa = PBXBuildFile; fileRef = 918EFFEC21D79A2E007CF83A /* config.json */; };
D6033184224E475A0019E640 /* TRTCMoreViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D603317C224E475A0019E640 /* TRTCMoreViewController.m */; };
D6033185224E475A0019E640 /* TCMediaFileReader.m in Sources */ = {isa = PBXBuildFile; fileRef = D603317E224E475A0019E640 /* TCMediaFileReader.m */; };
D6033186224E475A0019E640 /* TestRenderVideoFrame.m in Sources */ = {isa = PBXBuildFile; fileRef = D603317F224E475A0019E640 /* TestRenderVideoFrame.m */; };
Expand Down Expand Up @@ -54,8 +53,6 @@
D689A8D921CC8D4E00C7C618 /* AFURLRequestSerialization.m in Sources */ = {isa = PBXBuildFile; fileRef = D689A8C321CC8D4E00C7C618 /* AFURLRequestSerialization.m */; };
D689A8DA21CC8D4E00C7C618 /* AFNetworkReachabilityManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D689A8C521CC8D4E00C7C618 /* AFNetworkReachabilityManager.m */; };
D689A8DB21CC8D4E00C7C618 /* AFSecurityPolicy.m in Sources */ = {isa = PBXBuildFile; fileRef = D689A8C621CC8D4E00C7C618 /* AFSecurityPolicy.m */; };
D689A92021CC921700C7C618 /* TXLiteAVSDK_TRTC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D689A91F21CC921700C7C618 /* TXLiteAVSDK_TRTC.framework */; };
D689A92221CC927A00C7C618 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D689A92121CC927A00C7C618 /* libc++.tbd */; };
D6940FEB21CC8A1000469982 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = D6940FEA21CC8A1000469982 /* AppDelegate.m */; };
D6940FF121CC8A1000469982 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D6940FEF21CC8A1000469982 /* Main.storyboard */; };
D6940FF321CC8A1100469982 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D6940FF221CC8A1100469982 /* Assets.xcassets */; };
Expand All @@ -73,7 +70,6 @@
918EFF7B21D727C3007CF83A /* TRTCVideoViewLayout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TRTCVideoViewLayout.m; sourceTree = "<group>"; };
918EFF8021D727DC007CF83A /* MBProgressHUD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MBProgressHUD.h; sourceTree = "<group>"; };
918EFF8121D727DC007CF83A /* MBProgressHUD.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MBProgressHUD.m; sourceTree = "<group>"; };
918EFFEC21D79A2E007CF83A /* config.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = config.json; sourceTree = "<group>"; };
D603317B224E475A0019E640 /* TRTCMoreViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TRTCMoreViewController.h; sourceTree = "<group>"; };
D603317C224E475A0019E640 /* TRTCMoreViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TRTCMoreViewController.m; sourceTree = "<group>"; };
D603317E224E475A0019E640 /* TCMediaFileReader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TCMediaFileReader.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -167,8 +163,6 @@
D689A8C521CC8D4E00C7C618 /* AFNetworkReachabilityManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AFNetworkReachabilityManager.m; sourceTree = "<group>"; };
D689A8C621CC8D4E00C7C618 /* AFSecurityPolicy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AFSecurityPolicy.m; sourceTree = "<group>"; };
D689A8C721CC8D4E00C7C618 /* AFHTTPSessionManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AFHTTPSessionManager.h; sourceTree = "<group>"; };
D689A91F21CC921700C7C618 /* TXLiteAVSDK_TRTC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = TXLiteAVSDK_TRTC.framework; path = SDK/TXLiteAVSDK_TRTC/TXLiteAVSDK_TRTC.framework; sourceTree = "<group>"; };
D689A92121CC927A00C7C618 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
D6940FE621CC8A1000469982 /* TRTCDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TRTCDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
D6940FE921CC8A1000469982 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
D6940FEA21CC8A1000469982 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
Expand All @@ -190,8 +184,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
D689A92221CC927A00C7C618 /* libc++.tbd in Frameworks */,
D689A92021CC921700C7C618 /* TXLiteAVSDK_TRTC.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -397,16 +389,13 @@
D689A91E21CC921700C7C618 /* Frameworks */ = {
isa = PBXGroup;
children = (
D689A92121CC927A00C7C618 /* libc++.tbd */,
D689A91F21CC921700C7C618 /* TXLiteAVSDK_TRTC.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
D6940FDD21CC8A1000469982 = {
isa = PBXGroup;
children = (
918EFFEC21D79A2E007CF83A /* config.json */,
D6940FE821CC8A1000469982 /* TRTCDemo */,
D6940FE721CC8A1000469982 /* Products */,
D689A91E21CC921700C7C618 /* Frameworks */,
Expand Down Expand Up @@ -509,7 +498,6 @@
D6940FF621CC8A1100469982 /* LaunchScreen.storyboard in Resources */,
D622D0EE227051D800E4D569 /* goodluck.mp4 in Resources */,
D622D0EF227051D800E4D569 /* FilterResource.bundle in Resources */,
918EFFED21D79A2E007CF83A /* config.json in Resources */,
D6940FF321CC8A1100469982 /* Assets.xcassets in Resources */,
D6940FF121CC8A1000469982 /* Main.storyboard in Resources */,
D60331A8224E47860019E640 /* QBImagePicker.storyboard in Resources */,
Expand Down Expand Up @@ -669,8 +657,8 @@
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = FN2V63AD2J;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/SDK/TXLiteAVSDK_TRTC";
HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/SDK/TXLiteAVSDK_TRTC/TXLiteAVSDK_TRTC.framework/Headers";
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
HEADER_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = TRTCDemo/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = (
Expand Down Expand Up @@ -803,8 +791,8 @@
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = QE8PS7F45A;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/SDK/TXLiteAVSDK_TRTC";
HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/SDK/TXLiteAVSDK_TRTC/TXLiteAVSDK_TRTC.framework/Headers";
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
HEADER_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = TRTCDemo/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = (
Expand All @@ -825,8 +813,8 @@
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = "";
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/SDK/TXLiteAVSDK_TRTC";
HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/SDK/TXLiteAVSDK_TRTC/TXLiteAVSDK_TRTC.framework/Headers";
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
HEADER_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = TRTCDemo/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = (
Expand Down
Binary file removed ...xcodeproj/project.xcworkspace/xcuserdata/rstru.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
1 change: 0 additions & 1 deletion iOS/config.json
View file

This file was deleted.

0 comments on commit e04a516

Please sign in to comment.