Skip to content

Commit 2bd97d7

Browse files
Chen-AlexanderChen-Alexander
authored
Merge branch 'master' into dev/cjw
2 parents 7bc1b2e + 0685c81 commit 2bd97d7

82 files changed

Lines changed: 13943 additions & 163 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎azure-pipelines.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,20 @@ jobs:
1919
project: 'APIExample'
2020
scheme: 'APIExample'
2121

22+
2223
- template: ./Android/build-template/build-android.yml
2324
parameters:
2425
project: 'Android/APIExample'
2526
module: 'app'
2627
name: 'APIExampleAndroid'
28+
29+
- template: windows/cicd/templates/build-Windows.yml
30+
parameters:
31+
displayName: 'ApiExampleWindows'
32+
workingDirectory: 'windows/APIExample'
33+
scheme: 'APIExample'
34+
solutionName: 'APIExample.sln'
35+
sdkVersion: '3_0_1'
36+
Machine: x86
37+
release: 'Release'
38+

‎iOS/APIExample-Mac/APIExample_Mac.entitlements‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>com.apple.security.app-sandbox</key>
6+
<true/>
7+
<key>com.apple.security.files.user-selected.read-only</key>
8+
<true/>
9+
</dict>
10+
</plist>

‎iOS/APIExample-Mac/AppDelegate.swift‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
//
2+
// AppDelegate.swift
3+
// APIExample-Mac
4+
//
5+
// Created by CavanSu on 2020/5/26.
6+
// Copyright © 2020 Agora Corp. All rights reserved.
7+
//
8+
9+
import Cocoa
10+
11+
@NSApplicationMain
12+
class AppDelegate: NSObject, NSApplicationDelegate {
13+
14+
15+
16+
func applicationDidFinishLaunching(_ aNotification: Notification) {
17+
// Insert code here to initialize your application
18+
}
19+
20+
func applicationWillTerminate(_ aNotification: Notification) {
21+
// Insert code here to tear down your application
22+
}
23+
24+
25+
}
26+

‎iOS/APIExample-Mac/Assets.xcassets/AppIcon.appiconset/Contents.json‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "mac",
5+
"size" : "16x16",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "mac",
10+
"size" : "16x16",
11+
"scale" : "2x"
12+
},
13+
{
14+
"idiom" : "mac",
15+
"size" : "32x32",
16+
"scale" : "1x"
17+
},
18+
{
19+
"idiom" : "mac",
20+
"size" : "32x32",
21+
"scale" : "2x"
22+
},
23+
{
24+
"idiom" : "mac",
25+
"size" : "128x128",
26+
"scale" : "1x"
27+
},
28+
{
29+
"idiom" : "mac",
30+
"size" : "128x128",
31+
"scale" : "2x"
32+
},
33+
{
34+
"idiom" : "mac",
35+
"size" : "256x256",
36+
"scale" : "1x"
37+
},
38+
{
39+
"idiom" : "mac",
40+
"size" : "256x256",
41+
"scale" : "2x"
42+
},
43+
{
44+
"idiom" : "mac",
45+
"size" : "512x512",
46+
"scale" : "1x"
47+
},
48+
{
49+
"idiom" : "mac",
50+
"size" : "512x512",
51+
"scale" : "2x"
52+
}
53+
],
54+
"info" : {
55+
"version" : 1,
56+
"author" : "xcode"
57+
}
58+
}

‎iOS/APIExample-Mac/Assets.xcassets/Contents.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"info" : {
3+
"version" : 1,
4+
"author" : "xcode"
5+
}
6+
}

‎iOS/APIExample-Mac/Base.lproj/Main.storyboard‎

Lines changed: 980 additions & 0 deletions
Large diffs are not rendered by default.

‎iOS/APIExample-Mac/Info.plist‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>$(DEVELOPMENT_LANGUAGE)</string>
7+
<key>CFBundleExecutable</key>
8+
<string>$(EXECUTABLE_NAME)</string>
9+
<key>CFBundleIconFile</key>
10+
<string></string>
11+
<key>CFBundleIdentifier</key>
12+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
13+
<key>CFBundleInfoDictionaryVersion</key>
14+
<string>6.0</string>
15+
<key>CFBundleName</key>
16+
<string>$(PRODUCT_NAME)</string>
17+
<key>CFBundlePackageType</key>
18+
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
19+
<key>CFBundleShortVersionString</key>
20+
<string>1.0</string>
21+
<key>CFBundleVersion</key>
22+
<string>1</string>
23+
<key>LSMinimumSystemVersion</key>
24+
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
25+
<key>NSHumanReadableCopyright</key>
26+
<string>Copyright © 2020 Agora Corp. All rights reserved.</string>
27+
<key>NSMainStoryboardFile</key>
28+
<string>Main</string>
29+
<key>NSPrincipalClass</key>
30+
<string>NSApplication</string>
31+
<key>NSSupportsAutomaticTermination</key>
32+
<true/>
33+
<key>NSSupportsSuddenTermination</key>
34+
<true/>
35+
<key>NSMicrophoneUsageDescription</key>
36+
<string>Mic</string>
37+
<key>NSCameraUsageDescription</key>
38+
<string>Camera</string>
39+
</dict>
40+
</plist>

‎iOS/APIExample-Mac/Popover.storyboard‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="16097" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
3+
<dependencies>
4+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="16097"/>
5+
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
6+
</dependencies>
7+
<scenes>
8+
<!--Render View Controller-->
9+
<scene sceneID="IZJ-uU-HAT">
10+
<objects>
11+
<viewController storyboardIdentifier="RenderViewController" id="Gbz-1B-zuG" customClass="RenderViewController" customModule="APIExample_Mac" customModuleProvider="target" sceneMemberID="viewController">
12+
<view key="view" id="dkH-mp-c01" customClass="AGEVideoContainer" customModule="AGEVideoLayout">
13+
<rect key="frame" x="0.0" y="0.0" width="450" height="300"/>
14+
<autoresizingMask key="autoresizingMask"/>
15+
</view>
16+
</viewController>
17+
<customObject id="xBq-6f-mMf" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
18+
</objects>
19+
<point key="canvasLocation" x="89" y="173"/>
20+
</scene>
21+
</scenes>
22+
</document>

‎iOS/APIExample-Mac/ReplaceSegue.swift‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
//
2+
// ReplaceSegue.swift
3+
// Agora-Rtm-Tutorial-Mac
4+
//
5+
// Created by CavanSu on 2019/1/31.
6+
// Copyright © 2019 Agora. All rights reserved.
7+
//
8+
9+
import Cocoa
10+
11+
class ReplaceSegue: NSStoryboardSegue {
12+
override func perform() {
13+
let sourceVC = self.sourceController as! NSViewController
14+
sourceVC.view.window?.contentViewController = self.destinationController as? NSViewController
15+
}
16+
}

0 commit comments

Comments
 (0)