From 5504efdce86a2d826acb2a44eddfe640d365d486 Mon Sep 17 00:00:00 2001
From: zher52 <zher52@aliyun.com>
Date: Mon, 18 Apr 2022 22:18:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BD=8E=E7=89=88=E6=9C=ACio?=
 =?UTF-8?q?s=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BA=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin.xml                             |   1 +
 src/ios/VideoCallingViewController.m   |  18 ++++++
 src/ios/VideoCallingViewController.xib |  75 +++++++++----------------
 src/ios/iconfont.ttf                   | Bin 0 -> 3800 bytes
 4 files changed, 44 insertions(+), 50 deletions(-)
 create mode 100644 src/ios/iconfont.ttf

diff --git a/plugin.xml b/plugin.xml
index 27d405f..5c7f87d 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -61,6 +61,7 @@
         <source-file src="src/ios/VideoCallingViewController.m"/>
 
         <resource-file src="src/ios/VideoCallingViewController.xib"/>
+        <resource-file src="src/ios/iconfont.ttf"/>
 
         <podspec>
             <config>
diff --git a/src/ios/VideoCallingViewController.m b/src/ios/VideoCallingViewController.m
index d4541af..a616d8a 100755
--- a/src/ios/VideoCallingViewController.m
+++ b/src/ios/VideoCallingViewController.m
@@ -42,6 +42,9 @@ static const NSInteger maxRemoteUserNum = 7;
 @interface VideoCallingViewController ()<TRTCCloudDelegate>
 
 @property (weak, nonatomic) IBOutlet UIButton *backButton;
+@property (weak, nonatomic) IBOutlet UIButton *micButton;
+@property (weak, nonatomic) IBOutlet UIButton *spakeButton;
+@property (weak, nonatomic) IBOutlet UIButton *camareButton;
 @property (weak, nonatomic) IBOutlet UIButton *subVisibleButton;
 @property (weak, nonatomic) IBOutlet UIButton *viewRotateButton;
 @property (strong, nonatomic) IBOutletCollection(UIView) NSArray *remoteViewArr;
@@ -133,6 +136,21 @@ static const NSInteger maxRemoteUserNum = 7;
 
 - (void)setupDefaultUIConfig {
     NSLog(@"TRTC - setupDefaultUIConfig:::::");
+//    UIFont*font = [UIFont  size:24];
+
+//    NSMutableAttributedString *attributedStr = [[NSMutableAttributedString alloc] initWithString:@"\U0000e679" attributes: @{NSFontAttributeName:font}];
+//    [_backButton setFont:(API_DEPRECATED("Specify an attributed title with a custom font", ios(2.0, 3.0)) UIFont *)]
+//    [_backButton setAttributedTitle:attributedStr  forState:UIControlStateNormal];
+//    self.backButton.titleLabel.font = ;
+    [_backButton setTitle:@"\U0000e679" forState:UIControlStateNormal];
+    [_micButton setTitle:@"\U0000e67a" forState:UIControlStateNormal];
+    [_micButton setTitle:@"\U0000e658" forState:UIControlStateSelected];
+    [_spakeButton setTitle:@"\U0000e664" forState:UIControlStateNormal];
+    [_spakeButton setTitle:@"\U0000e775" forState:UIControlStateSelected];
+    [_camareButton setTitle:@"\U0000e824" forState:UIControlStateNormal];
+    [_subVisibleButton setTitle:@"\U0000e695" forState:UIControlStateNormal];
+    [_subVisibleButton setTitle:@"\U0000e81a" forState:UIControlStateSelected];
+    [_viewRotateButton setTitle:@"\U0000e657" forState:UIControlStateNormal];
     _displayLabel.text = @"我";
     _displayLabel.hidden = NO;
     _rotation = 0;
diff --git a/src/ios/VideoCallingViewController.xib b/src/ios/VideoCallingViewController.xib
index 60fbb93..df42f81 100755
--- a/src/ios/VideoCallingViewController.xib
+++ b/src/ios/VideoCallingViewController.xib
@@ -7,10 +7,19 @@
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
+    <customFonts key="customFonts">
+        <array key="iconfont.ttf">
+            <string>iconfont</string>
+        </array>
+    </customFonts>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="VideoCallingViewController">
             <connections>
+                <outlet property="backButton" destination="rzV-fr-mUd" id="jsi-OX-Fbp"/>
+                <outlet property="camareButton" destination="S9T-PM-Hhz" id="KA2-ov-Mnw"/>
                 <outlet property="displayLabel" destination="YvU-M3-dYi" id="51r-fe-mFR"/>
+                <outlet property="micButton" destination="cqv-YF-v7M" id="FbY-rW-BlF"/>
+                <outlet property="spakeButton" destination="iNs-1U-f8V" id="8O5-1H-dOv"/>
                 <outlet property="subVisibleButton" destination="qp6-PK-LBy" id="eyH-u5-0dn"/>
                 <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
                 <outlet property="viewRotateButton" destination="rF6-xK-afO" id="cn9-hg-AYV"/>
@@ -204,16 +213,16 @@
                         <constraint firstAttribute="height" constant="160" id="Ydt-pt-cM4"/>
                     </constraints>
                 </view>
-                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="rzV-fr-mUd">
-                    <rect key="frame" x="0.0" y="0.0" width="41" height="31"/>
-                    <state key="normal" title="Button"/>
-                    <buttonConfiguration key="configuration" style="plain" image="chevron.backward" catalog="system" title=" "/>
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="rzV-fr-mUd">
+                    <rect key="frame" x="0.0" y="0.0" width="30" height="36"/>
+                    <fontDescription key="fontDescription" name="iconfont" family="iconfont" pointSize="24"/>
+                    <state key="normal" title=""/>
                     <connections>
                         <action selector="onBackClick:" destination="-1" eventType="touchUpInside" id="aV2-bn-bDv"/>
                     </connections>
                 </button>
                 <stackView opaque="NO" contentMode="scaleAspectFit" translatesAutoresizingMaskIntoConstraints="NO" id="XCN-Qr-goF">
-                    <rect key="frame" x="82" y="666" width="250" height="50"/>
+                    <rect key="frame" x="107" y="666" width="200" height="50"/>
                     <subviews>
                         <button opaque="NO" contentMode="scaleToFill" selected="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cqv-YF-v7M">
                             <rect key="frame" x="0.0" y="0.0" width="50" height="50"/>
@@ -221,14 +230,8 @@
                                 <constraint firstAttribute="width" constant="50" id="dwe-bq-Wq8"/>
                                 <constraint firstAttribute="height" constant="50" id="iQf-fV-QIk"/>
                             </constraints>
-                            <fontDescription key="fontDescription" type="system" pointSize="36"/>
-                            <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
-                            <state key="normal" image="mic.slash" catalog="system">
-                                <preferredSymbolConfiguration key="preferredSymbolConfiguration" scale="large"/>
-                            </state>
-                            <state key="selected" image="mic" catalog="system">
-                                <preferredSymbolConfiguration key="preferredSymbolConfiguration" scale="large"/>
-                            </state>
+                            <fontDescription key="fontDescription" name="iconfont" family="iconfont" pointSize="24"/>
+                            <state key="normal" title=""/>
                             <connections>
                                 <action selector="onMicCaptureClick:" destination="-1" eventType="touchUpInside" id="74S-01-YUi"/>
                             </connections>
@@ -238,13 +241,8 @@
                             <constraints>
                                 <constraint firstAttribute="width" constant="50" id="N3O-bv-Nk0"/>
                             </constraints>
-                            <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
-                            <state key="normal" image="speaker.wave.2" catalog="system">
-                                <preferredSymbolConfiguration key="preferredSymbolConfiguration" scale="large"/>
-                            </state>
-                            <state key="selected" image="ear" catalog="system">
-                                <preferredSymbolConfiguration key="preferredSymbolConfiguration" scale="large"/>
-                            </state>
+                            <fontDescription key="fontDescription" name="iconfont" family="iconfont" pointSize="24"/>
+                            <state key="normal" title=""/>
                             <connections>
                                 <action selector="onSwitchSpeakerClick:" destination="-1" eventType="touchUpInside" id="QhV-mp-sQc"/>
                             </connections>
@@ -254,13 +252,8 @@
                             <constraints>
                                 <constraint firstAttribute="width" constant="50" id="PuT-SC-nBb"/>
                             </constraints>
-                            <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
-                            <state key="normal" image="camera.rotate" catalog="system">
-                                <preferredSymbolConfiguration key="preferredSymbolConfiguration" scale="large"/>
-                            </state>
-                            <state key="selected" image="camera.rotate" catalog="system">
-                                <preferredSymbolConfiguration key="preferredSymbolConfiguration" scale="large"/>
-                            </state>
+                            <fontDescription key="fontDescription" name="iconfont" family="iconfont" pointSize="24"/>
+                            <state key="normal" title=""/>
                             <connections>
                                 <action selector="onSwitchCameraClick:" destination="-1" eventType="touchUpInside" id="oQG-9m-ga4"/>
                             </connections>
@@ -270,26 +263,19 @@
                             <constraints>
                                 <constraint firstAttribute="width" constant="50" id="U8G-VC-E4h"/>
                             </constraints>
-                            <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
-                            <state key="normal" image="eye.slash" catalog="system">
-                                <preferredSymbolConfiguration key="preferredSymbolConfiguration" scale="large"/>
-                            </state>
-                            <state key="selected" image="eye" catalog="system">
-                                <preferredSymbolConfiguration key="preferredSymbolConfiguration" scale="large"/>
-                            </state>
+                            <fontDescription key="fontDescription" name="iconfont" family="iconfont" pointSize="24"/>
+                            <state key="normal" title=""/>
                             <connections>
                                 <action selector="onSubVisibleChange:" destination="-1" eventType="touchUpInside" id="ZHg-NL-PVq"/>
                             </connections>
                         </button>
-                        <button opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="rF6-xK-afO">
+                        <button hidden="YES" opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="rF6-xK-afO">
                             <rect key="frame" x="200" y="0.0" width="50" height="50"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="50" id="xJB-cA-Wjz"/>
                             </constraints>
-                            <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
-                            <state key="normal" title=" " image="rotate.right" catalog="system">
-                                <preferredSymbolConfiguration key="preferredSymbolConfiguration" scale="large"/>
-                            </state>
+                            <fontDescription key="fontDescription" name="iconfont" family="iconfont" pointSize="24"/>
+                            <state key="normal" title=""/>
                             <connections>
                                 <action selector="onVideoRotate:" destination="-1" eventType="touchUpInside" id="isy-8q-IGB"/>
                             </connections>
@@ -328,15 +314,4 @@
             <point key="canvasLocation" x="137.68115942028987" y="123.91304347826087"/>
         </view>
     </objects>
-    <resources>
-        <image name="camera.rotate" catalog="system" width="128" height="94"/>
-        <image name="chevron.backward" catalog="system" width="96" height="128"/>
-        <image name="ear" catalog="system" width="105" height="128"/>
-        <image name="eye" catalog="system" width="128" height="81"/>
-        <image name="eye.slash" catalog="system" width="128" height="86"/>
-        <image name="mic" catalog="system" width="108" height="128"/>
-        <image name="mic.slash" catalog="system" width="108" height="128"/>
-        <image name="rotate.right" catalog="system" width="118" height="128"/>
-        <image name="speaker.wave.2" catalog="system" width="128" height="90"/>
-    </resources>
 </document>
diff --git a/src/ios/iconfont.ttf b/src/ios/iconfont.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..04123442140cef42e64708a3034bb3712021228e
GIT binary patch
literal 3800
zcmd^CTW=fJ5uUTli%5#g%TlB%*%B`jsT-FvNs+QHlpNWz<Jy*BSr=a=N}^;Xk|<NO
z8>L7f$8BmS2HZTPa9;`o1&X#tS~m|ZdI6#)Mf&0bg;BRCP#8`hXai}{KGa2DMD{zo
zlw&(V`vbbmbIzPOb7p70nKQd2Mno3cAdxx_jE=qFd%NjXBGv`&@!`>Etas_qzcIgt
z`Sk2^W_9p!UoVlc11+?$v_7xD{@!^a-6WCm%DHT2&ewF=1lb2@$#Y;B?~6YH{Y$jQ
zbIXNS+FL;p`zyNkrQB?$>SOaiuzvva9m|<lR#`1AVIBI(w~|@T+P~9#8wNhW^A=Wf
zYlTmKUb;*q9mM)|g6-l)d4o>tRINH}1pn#FqH@4pUAyz%l&$wMSs;b${^f=@KO4&*
z=t$g)c@+tqi;HWr&@}1Q8RwdD6P4Auwr-{lN|Uf}=<sopmNJDEswGXmw*EBDmKGN>
z(66m9$njMM4kJT_tJCS&H~15UtHK@du4^Ovlwu4!1=5S)e!(>|zkiN4ixZC;RXj-i
zGi^ZZSu_Ox!2jBS;`Ta3x##?O?b<f>?TWq|;Bw9F7=Z}*Ivz7}k{ukOI9Z%4zFK^}
z`0m3Ck7^$^mVsDt0=)HSdD!vv#jxLn+x_I`i0fblBO?$psj-1QjHC7cepRagT&ci-
zC=@5O#v@Y1Y2=LuvpA<U9?jyq)_C-aIOV(nTPnV;HJ*pXceMt*>EQ*f@vMDRt2KT;
z9yMxB%?@rtBYl<bvVH81a7ef*){1lDulX~|e;0ly+R1@b3WQlGkz&c1+hsH{x62^h
zbV;R~lEkK^=ABaMLzb3y+SM8Fb~b}m`VdRphjLl`6$0<1041mg84#;yH7=tknNnCd
z6byiBYG4vG)-#Vg9!q&rO!gRRT=k4k48efHIuqa~6c!XHbv9-D@>C@F=H#il(c#I)
z()BZP{OAsKerEhiVk`2)e$n6Mw@Ur(3WPu2V3-MKlV?()#*4$}Ph1U!cTPyTGtTfr
z@8nydaNz54;kTu~r6sFB<rmZL)R|QK;SD1u92?*T`!`{~OmWyA4Ev42fT70Wa>xC#
zWTzt$5`%Cg7?7B1aWWN`1a5O84g1}ml(>3(piBd|{n4mjc!2)LADwWg{mPL@<cQKa
z=IpWdpNOUBdwUo9BF7r`3Y!B1QU4Yf^b0<JwDg0MJL)1wP90HtI--YK`xe$0dV>uw
zaNCd*<$K~KF@mhAp<UEMUxJ0nRHq^WO?@H+JAreW>EmI*Dd-tEE)R3Zk_mmVGnoo=
zaD`4y5a`#yGtI9=Ncfh6v6i9nqsc0E*W2jb)$gq<-7~&l+tJUyxiw}DdaH$7=*u+L
z7})3bv<~<BAU1g6;F#0vb)p`4y=*$ze6Q_Lw93D?^|8b2b?n)_H#G6u`^G?jN9|9A
zTh-p6b!!a0V^S~e)BAgmwsEN!H;!8-p$k8rqveu#N%#x-Xn>}OnqYINGt|%0A`B0Q
zQi)_d=BXE52BX0!)-#L}q7g#M>`p?8B@`iy8Km4|D9Q|hHWmo=v3M|%>|u~d)(eQH
z#6m*ZWU<vSo8W4!wWZqZtj1Ptu8Rg_*%9n+u{&j(K{82BLDZY|Mx)6h3QoyveRy<a
z)MPVOyS$9m%B_9rueo>H3}(0QlF@B*SOh5?iPv?Vs<+6tnkqTbv+vNp`o3m%xTd`?
zDpy%$$zZ55+Dvkt%WgC24U$}48W`F?#CAA-QB#+Qui8aVK-&7A<Z}WFE#@4Lf1%E{
z(|#JJQDBnhL3|1egg?qs&-m`)&@|!T!PD^Pa7bxD>|!j%j3U{+&jJwioK*}@Ic)$M
zr5Fpt&6;QZe?xXnZ~#i9itydYC(icgo$swZtC*g4*Tj){T>8_GxQnhQuCLhbFRH%(
zlQl)QPAc%7pT&D(o7je$)W_>cn)M;P3`cJl4xiAZC9=fSilJtIC8@Ej9#@Em+E`~=
z5J(wTl;P9E3eV>w$h18(g_%8C0-v;bJT_+L{mFwD1{o<wqxV#K<sQ%6TRcg-XS(rw
zlCB<`Dvxf`a(qLx_4nd9Yz@!|x7F>!vFn7j5_5ZSyNrf<oYiC^911H))3_rb2?$ae
zH8Cxy6%wadOXQ@&kliRRX_k_c&>`@1(&$Z&kF?tS1_9Y<+!-)?JZ6j8V6KsdUK^`(
z>gxkeoxN%5E9VF6Z&Zgp!I;HlY6zG-(UH@`?i<Y`ZwYPC;dQp}cQ+oHs5gj~T8k8r
z^^$+sUu`kfdTor-D^~{{PE&)U_u`17b1~f$FMT9?VnL6~7I2#E;WNV#7HwgD`)|HI
zqP<VVKM0$s^$q;Hg9UIF)v_K#GOFcXL~KwQ@d`j9idxY`9Jx=lICc73Q`5E6Q+KzC
z#qOCsYGC%vbO(C^fu14W37aj=@0>mRPIJrlxb<m83Nd736*0)F@6hrGc>nAr36Y2q
z3MUK4aaxcDs0h1Q99a|e^NJpHph);*Zcuu4a2c==LWxhxpH+KRRvg%vmaUtc&0W(a
zlC5R3$^%`^jGDU!N)H6EyPCHK&{xS;Vbdzh)~x}n%r-ZsRk`V#oK<?jd|a^f09(u0
zswpU`i;TDka-M+Yef4{d(=r;~%xYhSnMMov3aG2lBHs3a3ata(TA}s$8je+H1NeOv
z+DvVzBAOlxG_E3wOvnENgy?dGX81DveuWl*<IgHI>ID6!LhC^Pu|n%nn;uqZ1Nd7N
z+DzljTA?izVzYz!Y^IQ%^UbXL7H4xS^SPD6_IND2aA7Hv-=1!d<JtV$Vs6E^Tj|(l
z9muX^^V@3HE-u6hg?Zn6KDX=}g1+q1QqH%U&%KnLEhy&-h1Kq8ls|{_mD$`f4N{)6
zl%WFpIlN?MXdV3`%~Fn5XkP6LpPL_p^a5SLhjRw||CjVQr1P`}Ij+-3yGg-ckLPzC
zfYgdA`Mfo2bP-RB!NvkC@}cFSX&KZ|#l9>oSpw}t0QuTW&@&5Zh0dwFR;in!xVQb;
zmRD3im(_Zu<`up_zwoj!fr(7V^vuAFtcsbKnORsh>1HysFPoR=BH8t9BsV|r0GZET
zM3}OXS^NRaXN=2>vwX$8wwlenoXt<=RxD4*`FRn`Vm6Z(p}=rxaH=EG2?PEE=WJ^w

literal 0
HcmV?d00001