Skip to content

global settings for Video Configuration #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
plutoless merged 5 commits into from
Dec 16, 2020
Merged

global settings for Video Configuration #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a675b9a
global settings for Video Configuration
xuchdeid Dec 15, 2020
a34fd8c
FIX ci settings
xuchdeid Dec 16, 2020
e53289a
modify Setting UI
xuchdeid Dec 16, 2020
a46516f
FIX: ui string
xuchdeid Dec 16, 2020
34700a6
CHG: optimze code
xuchdeid Dec 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions macOS/APIExample.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,10 @@
03B12DA4250E8F7F00E55818 /* AgoraExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03B12DA3250E8F7F00E55818 /* AgoraExtension.swift */; };
03B321DB24FC0D5E008EBD2C /* AgoraCameraSourceMediaIO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03B321D724FC0D5D008EBD2C /* AgoraCameraSourceMediaIO.swift */; };
4667B9F286200B077FFDFDE1 /* Pods_APIExampleTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CA9B97F4DF8A31A030414B3 /* Pods_APIExampleTests.framework */; };
57887A67258856B7006E962A /* Settings.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 57887A69258856B7006E962A /* Settings.storyboard */; };
57887A75258859D8006E962A /* SettingsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57887A74258859D8006E962A /* SettingsController.swift */; };
57887A83258886E1006E962A /* SettingCells.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57887A82258886E1006E962A /* SettingCells.swift */; };
57887A87258889ED006E962A /* SettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57887A86258889ED006E962A /* SettingsViewController.swift */; };
596A9F79AF0CD8DC1CA93253 /* Pods_APIExample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6F65EF2B97B89DE4581B426B /* Pods_APIExample.framework */; };
EBDD0209B272C276B21B6270 /* Pods_APIExample_APIExampleUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FC2BAB0AC82140B7CEEA31DA /* Pods_APIExample_APIExampleUITests.framework */; };
/* End PBXBuildFile section */
Expand Down Expand Up @@ -203,6 +207,10 @@
0CA9B97F4DF8A31A030414B3 /* Pods_APIExampleTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_APIExampleTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
1784955BB217D1790A452465 /* Pods-APIExampleTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-APIExampleTests.release.xcconfig"; path = "Target Support Files/Pods-APIExampleTests/Pods-APIExampleTests.release.xcconfig"; sourceTree = "<group>"; };
4C8551EF6F12F734D8F7C1F5 /* Pods-APIExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-APIExample.release.xcconfig"; path = "Target Support Files/Pods-APIExample/Pods-APIExample.release.xcconfig"; sourceTree = "<group>"; };
57887A68258856B7006E962A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Settings.storyboard; sourceTree = "<group>"; };
57887A74258859D8006E962A /* SettingsController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsController.swift; sourceTree = "<group>"; };
57887A82258886E1006E962A /* SettingCells.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingCells.swift; sourceTree = "<group>"; };
57887A86258889ED006E962A /* SettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsViewController.swift; sourceTree = "<group>"; };
6F65EF2B97B89DE4581B426B /* Pods_APIExample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_APIExample.framework; sourceTree = BUILT_PRODUCTS_DIR; };
84C863718A380DFD36ABF19F /* Pods-APIExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-APIExample.debug.xcconfig"; path = "Target Support Files/Pods-APIExample/Pods-APIExample.debug.xcconfig"; sourceTree = "<group>"; };
B53F41CB5AC550EA43C47363 /* Pods-APIExampleTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-APIExampleTests.debug.xcconfig"; path = "Target Support Files/Pods-APIExampleTests/Pods-APIExampleTests.debug.xcconfig"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -501,6 +509,8 @@
03896D3524F8A011008593CD /* Main.storyboard */,
03896D3824F8A011008593CD /* Info.plist */,
03896D3924F8A011008593CD /* APIExample.entitlements */,
57887A69258856B7006E962A /* Settings.storyboard */,
57887A74258859D8006E962A /* SettingsController.swift */,
);
path = APIExample;
sourceTree = "<group>";
Expand All @@ -526,6 +536,7 @@
03896D5B24F8D437008593CD /* Commons */ = {
isa = PBXGroup;
children = (
57887A7F25885FC2006E962A /* Settings */,
034C62922528474D00296ECF /* StatisticsInfo.swift */,
034C62862528255F00296ECF /* WindowsCenter.swift */,
034C626325257EA600296ECF /* GlobalSettings.swift */,
Expand Down Expand Up @@ -556,6 +567,15 @@
path = ExternalVideo;
sourceTree = "<group>";
};
57887A7F25885FC2006E962A /* Settings */ = {
isa = PBXGroup;
children = (
57887A82258886E1006E962A /* SettingCells.swift */,
57887A86258889ED006E962A /* SettingsViewController.swift */,
);
path = Settings;
sourceTree = "<group>";
};
72510F6AF209B24C1F66A819 /* Pods */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -693,6 +713,7 @@
033A9FDB252EB05A00BC26E1 /* PrecallTest.storyboard in Resources */,
033A9FFA252EB5FD00BC26E1 /* ScreenShare.storyboard in Resources */,
033AA005252EBBEC00BC26E1 /* Localizable.strings in Resources */,
57887A67258856B7006E962A /* Settings.storyboard in Resources */,
033A9FFF252EB60800BC26E1 /* StreamEncryption.storyboard in Resources */,
0301D31D2507C0F300DF3BEA /* MetalVideoView.xib in Resources */,
033A9FB8252EAEF700BC26E1 /* JoinChannelAudio.storyboard in Resources */,
Expand Down Expand Up @@ -843,6 +864,7 @@
files = (
0301D3182507B4A800DF3BEA /* AgoraMetalShader.metal in Sources */,
0333E63724FA32000063C5B0 /* VideoView.swift in Sources */,
57887A83258886E1006E962A /* SettingCells.swift in Sources */,
03B321DB24FC0D5E008EBD2C /* AgoraCameraSourceMediaIO.swift in Sources */,
034C628A25282D5D00296ECF /* JoinMultiChannel.swift in Sources */,
034C62A6252ABA5C00296ECF /* VoiceChanger.swift in Sources */,
Expand All @@ -863,6 +885,7 @@
033A9F9F252EA86A00BC26E1 /* CustomVideoRender.swift in Sources */,
0336A1CB25034F4700D61B7F /* AudioController.m in Sources */,
034C62672525857200296ECF /* JoinChannelAudio.swift in Sources */,
57887A87258889ED006E962A /* SettingsViewController.swift in Sources */,
034C62932528474D00296ECF /* StatisticsInfo.swift in Sources */,
033A9FA4252EA86A00BC26E1 /* RTMPStreaming.swift in Sources */,
03267E232500C265004A91A6 /* AgoraMediaRawData.m in Sources */,
Expand All @@ -875,6 +898,7 @@
033A9FA1252EA86A00BC26E1 /* CustomAudioRender.swift in Sources */,
034C627C2526C43900296ECF /* ScreenShare.swift in Sources */,
034C62712525A35800296ECF /* StreamEncryption.swift in Sources */,
57887A75258859D8006E962A /* SettingsController.swift in Sources */,
036D3A9E24FA3A1000B1D8DC /* LogUtils.swift in Sources */,
033A9EE2252C191000BC26E1 /* PrecallTest.swift in Sources */,
0333E63524FA30310063C5B0 /* BaseViewController.swift in Sources */,
Expand Down Expand Up @@ -1066,6 +1090,14 @@
name = Main.storyboard;
sourceTree = "<group>";
};
57887A69258856B7006E962A /* Settings.storyboard */ = {
isa = PBXVariantGroup;
children = (
57887A68258856B7006E962A /* Base */,
);
name = Settings.storyboard;
sourceTree = "<group>";
};
/* End PBXVariantGroup section */

/* Begin XCBuildConfiguration section */
Expand Down
43 changes: 29 additions & 14 deletions macOS/APIExample/Base.lproj/Main.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="16097.2"/>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17701"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
Expand Down Expand Up @@ -732,24 +733,24 @@
<objects>
<viewController id="frP-Og-4hq" customClass="MenuController" customModule="APIExample" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" id="bDS-2Z-AsB">
<rect key="frame" x="0.0" y="0.0" width="280" height="600"/>
<rect key="frame" x="0.0" y="0.0" width="280" height="602"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<scrollView fixedFrame="YES" autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Jvf-iG-0lJ">
<rect key="frame" x="0.0" y="0.0" width="320" height="600"/>
<scrollView fixedFrame="YES" autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Jvf-iG-0lJ">
<rect key="frame" x="0.0" y="30" width="280" height="572"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<clipView key="contentView" id="cyL-uB-YCU">
<rect key="frame" x="1" y="1" width="318" height="598"/>
<rect key="frame" x="1" y="1" width="278" height="570"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowSizeStyle="automatic" viewBased="YES" id="arv-VN-9VJ">
<rect key="frame" x="0.0" y="0.0" width="318" height="579"/>
<rect key="frame" x="0.0" y="0.0" width="278" height="551"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<size key="intercellSpacing" width="3" height="2"/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
<color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
<tableColumns>
<tableColumn width="315" minWidth="10" maxWidth="3.4028234663852886e+38" id="b03-7M-wbu">
<tableColumn width="266" minWidth="10" maxWidth="3.4028234663852886e+38" id="b03-7M-wbu">
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
Expand All @@ -762,11 +763,11 @@
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<prototypeCellViews>
<tableCellView identifier="menuCell" id="2hx-oV-azK">
<rect key="frame" x="1" y="1" width="315" height="17"/>
<rect key="frame" x="1" y="1" width="275" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Yoo-BB-x79">
<rect key="frame" x="20" y="0.0" width="315" height="17"/>
<rect key="frame" x="20" y="0.0" width="275" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="qG2-7c-SRN">
<font key="font" metaFont="system"/>
Expand All @@ -780,11 +781,11 @@
</connections>
</tableCellView>
<tableCellView identifier="headerCell" id="uWY-5d-ieJ">
<rect key="frame" x="1" y="20" width="315" height="17"/>
<rect key="frame" x="1" y="20" width="275" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="QTx-vV-DAq">
<rect key="frame" x="20" y="0.0" width="315" height="14"/>
<rect key="frame" x="20" y="0.0" width="275" height="14"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="Nlt-pS-UAz">
<font key="font" metaFont="systemBold" size="10"/>
Expand Down Expand Up @@ -813,10 +814,21 @@
<autoresizingMask key="autoresizingMask"/>
</scroller>
<scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="iWF-Ou-WIP">
<rect key="frame" x="224" y="17" width="15" height="102"/>
<rect key="frame" x="-100" y="-100" width="15" height="102"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
</scrollView>
<button id="1eW-RY-z9X">
<rect key="frame" x="0.0" y="0.0" width="32" height="32"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="NSSmartBadgeTemplate" imagePosition="overlaps" alignment="center" inset="2" id="PTe-Da-jjD">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
<connections>
<action selector="onClickSetting:" target="frP-Og-4hq" id="LYl-a0-Sxl"/>
</connections>
</button>
</subviews>
</view>
<connections>
Expand All @@ -825,7 +837,7 @@
</viewController>
<customObject id="nr4-u5-WOG" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="798" y="198"/>
<point key="canvasLocation" x="798" y="199"/>
</scene>
<!--View Controller-->
<scene sceneID="KsQ-B6-tlj">
Expand All @@ -841,4 +853,7 @@
<point key="canvasLocation" x="868" y="898"/>
</scene>
</scenes>
<resources>
<image name="NSSmartBadgeTemplate" width="14" height="14"/>
</resources>
</document>
Loading