From 24ac5ecad4fdde99ef861ca6576b8355af90f692 Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Wed, 21 Aug 2024 16:49:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/icon47-active.png       | Bin 0 -> 963 bytes
 src/assets/icon47.png              | Bin 0 -> 647 bytes
 src/assets/icon48.png              | Bin 0 -> 700 bytes
 src/page/Home/Index/index.tsx      |   3 ---
 src/page/Meeting/index.module.scss |  13 ++++++-------
 src/page/Meeting/index.tsx         |  26 ++++++++++++++++++++++++++
 src/utils/package/imageUrl.ts      |   6 ++++++
 src/utils/styles/App.scss          |  24 ++++++++++++++++++++++++
 8 files changed, 62 insertions(+), 10 deletions(-)
 create mode 100644 src/assets/icon47-active.png
 create mode 100644 src/assets/icon47.png
 create mode 100644 src/assets/icon48.png

diff --git a/src/assets/icon47-active.png b/src/assets/icon47-active.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b594e1c622386f34a46c22b8865db876cc6d926
GIT binary patch
literal 963
zcmV;!13dhRP)<h;3K|Lk000e1NJLTq001%o001%w1^@s69zTe&00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH16WB!K~#7F?U}t!
z8$lF>&n^Th4IUl<0zC+)M+jOF3J*X5C88i5bO{yEB?VB10@0F4h&C3Y4}u54fd^or
ziA2Iq&b8MD+iTCvdTlrRNh{mCcYe;^JAc<eMn*<PMn-Zxq>NTdJp+rZc#=Pr21cWX
ziXrfupO=4my$ymQQX~~2(s_1n*#|!G=ZsAm5k!$+`-9*RDbTi%XQkHJq0juPkc=X)
zt#$<^7V<}_(Ko<1SbD&M0=>GDG~^Nqc~UCh2b@&mKShcZGn+(=vyjLWzmPnXOaz=1
zW(R`c(xs5^Vk{yCfS>4`2tlz^C(@QnAtxa+COQyKaa6{iHP%A@DYcCB2DS||9E%@q
zjjhKBr`ek>dE+$!CzUZT2m+I#l}E%IJrE(37FruaD<O2-I(kI3TQFh_t!TQvK@VYg
z4Vl8L9|kBQUw_Zb<$%G#23vi1SAIS`3_LzUKRmpY;l1kfy7HC#&0u&f^5d|TjZp~4
zM!vyq<Kys8PoZybU+(d{URWr1bblXUXZ7@S^|60-g>Z7RTxM<#{`PiNs88GQ-~f7e
zH?|L6%*#w7WHdJZ*dggyGrWljcpDo{JEyO&5k|r>GJ?MIbA-I7&(0cbIZkpg;9D5H
zYxYdSrF!LR+tNEb@K;yiO-;dwyp-c(c=PkIk8Ng5r<J`1zD1AWRlPPhYa5r&(Hs8W
zUMb9s&>K=`QjDP`r@C0RhR_nU#J!9MhM0+x=U$Jw*U!plmX;WWuoB~{+KO;(trY)F
z>lbfv@{q6!mzLt|;LC&o8zJ%AX&IpR_cgbkhlU#M#B&tmA05@!OAl1aOBl+epf4`q
z)Q4J|)<nsKd-M>lBV(q+mT|C0D{28f!n4e{Sj}3D(I4m$l4-HAv)aZ-;U)X6PM!?o
zC^EY;W@Bi#`(=31D_iJ3)@?c^A9ya2^ZE?BLxJ9ywKaBH*(L8}vpA)Iq=i;o3OJ{O
zB&X$fHj@%i#CzA=mh)aq@=elEhdd*R?nDW?M4Luw=!p#?-StIMrp}4E3T-E`B{9KD
zKDCjYD9wlz@C9v<+W#YwAj!-dPje9kS!j8bKD0^qm`MGPo+w$77eR6;tNWwpLAD%B
lCVWq$^BEZ#85tRA@gMy-CNv{8Pb&Zb002ovPDHLkV1j`Gs3ZUY

literal 0
HcmV?d00001

diff --git a/src/assets/icon47.png b/src/assets/icon47.png
new file mode 100644
index 0000000000000000000000000000000000000000..18c6bb72a6b94653ae5cd0212259a573f1c959f0
GIT binary patch
literal 647
zcmV;20(kw2P)<h;3K|Lk000e1NJLTq001%o001%w1^@s69zTe&00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0vt(1K~#7F?V0UO
z!!Qtr-y;4~CLkM7CLkM-4PXP<pkWfa0Wd*f0@?}c4O%8R&Wfv+tJ6BkxlJWMlI8kz
zaqf*T{z!pDB9TZWdIk~YT;937amjFwaNt8OOWH8SIpRj+A2<S+=m5t!;;P_c27|#Q
z)-_SFxi3=a#o2d8#HQQ6Yc#k(dvY$rt@gtn-z!%a4X$ZK7a@{SfKMjczfhu!keO)P
z+3Kdo_uAFB!fv2M7a_)DyQ}eCr_(5)k5;r6!ZXf_tCcX<rk8u+hr&FA62U?^kTI8q
zTd~&x8R1r!S{eKzS5P8I2nYVeRf#H~!u__)g=@a28=nvZB|=9;ro^Kg6(j7K$9K)W
zXs=v)st_vVL$qzMIs8vFtFcLe28sj;;U{N2H-3iyWxe(HvXfeBqhV<>Yki7#UgPI`
z7i?O|5t&1gCPF?uHv8g-Ou@OwW}ry05KgZz><0bNAt2*3x=m;4X398l=M&G)c1i8X
zJ^hb`&pTqk9T%j>@PLRlMM!K-w<upwo^32v1U8GTBxG0J>ZViD;f1R6{rG@ih8Va2
zjzx)BQ1ukgTf~-_DaEBkL)xB4z7daCUb9LZ1M+_<Imt+9h-teJ_D6&hQj#7eP6bu7
z*MhoJ;?!^uBWj;w_PQtZ1t(@f&6rXj|8Ah_o9-k)z)!4E7(fyCl<jVH`$T9^od##_
hOp{0?5{X3b_yaUWHjj(*u<QT;002ovPDHLkV1m9y8eISY

literal 0
HcmV?d00001

diff --git a/src/assets/icon48.png b/src/assets/icon48.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e9242a387ab4f394150b5d329998f6083780096
GIT binary patch
literal 700
zcmV;t0z>_YP)<h;3K|Lk000e1NJLTq001)p001)x1^@s6I-xKs00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0#QjsK~#7F?V0US
z<S-0|-@Up2M+q*04$fD>K?S4(wgZ+5fC@qfKm~ycmJS>$SUM2$*cn15iR~nIcEHb!
zhHMglD3WE#0GUiC^BveA0z`Dee+rhrET=4@_4t*gW_e<H+-x@QI7V0r$x@L&2bPjW
z;F#bE-OzLtOM$h~E){5vF|M#CJb^te%Q_0tJl7gSA|*UvLGe&zB4RRS6vbtS6!1W2
z6dxV7gRJul)A*10Xhmd5gWs6Ondf_YcfW(#_4W0MZF}L_Ua~wQ7HoRq=_dC>ZesgT
z9)0W)6EZ2w>`7RK4vu~l0+_mHT%5Om*bksXxoGZjf?313;1~iiA-84ro%g%@k!(G4
zx$FS}OtDPuc>dP;-CgY4=E7QM&RAavR>n>sqz37}8}hZ^5E~lLk`JAC+mTDP*NunE
z7KjZGvUN;C_OuZ__ew`U0<j@e!;FPh<(ddTzi=p0A{8FiQ9}yx{Y!EqLgzH=K!XRY
z;Le|(Szhe*ADDv<R|0v>fo6x4kbhbd!Y$TfVTJCoHddjE=CQ*uK_+!k6h=j<YyLjS
z9B33h_q9?FG#tJa%WYQ)G9mwlRyfdTCy6BuhhaTIX+^ggs&OQJTD3w-sDJk^L%yn2
zbW8o~&AXq5N&Aeo!dT&?lgs9SyqhfQy+&K-)XEUgyx06gY{;EcErkr3SFmNs_<T^&
zG=nF$j_={gq~a{yNuzN|Z&DOzbEpv;a%ap-A&>$dXh-qTo2~a+X_#9A2rPdbq+Pf^
i+W&QCGMP-~$MONspcNT1s-*P*0000<MNUMnLSTYiFfYac

literal 0
HcmV?d00001

diff --git a/src/page/Home/Index/index.tsx b/src/page/Home/Index/index.tsx
index 899da7b..6b61f20 100644
--- a/src/page/Home/Index/index.tsx
+++ b/src/page/Home/Index/index.tsx
@@ -132,9 +132,6 @@ const Index: React.FC = () => {
                       <Button type="primary"
                         iconPosition={'end'}
                         onClick={() => {
-                          // window.electron.oepnWindow({
-                          //   url: location.origin + '/#/userVideo'
-                          // })
                           joinSettingRef.current.changeModal(item.roomNum)
                         }}
                         icon={<img src={ImageUrl.icon9} alt="" />}
diff --git a/src/page/Meeting/index.module.scss b/src/page/Meeting/index.module.scss
index 03ea97e..755b401 100644
--- a/src/page/Meeting/index.module.scss
+++ b/src/page/Meeting/index.module.scss
@@ -593,7 +593,7 @@
       align-items: center;
       justify-content: space-between;
       background-color: #07090B;
-      padding: 10px 50px;
+      padding: 4px 50px;
       box-sizing: border-box;
 
       >div {
@@ -601,6 +601,8 @@
         align-items: center;
 
         >div {
+          padding: 6px 0;
+          border-radius: 6px;
           display: flex;
           flex-direction: column;
           align-items: center;
@@ -635,17 +637,14 @@
           }
 
           &:hover {
-            >span {
-              color: #4096ff;
-            }
+            background-color: #161A29;
           }
 
           &:active {
-            >span {
-              color: darken(#4096ff, 10%) !important;
-            }
+            background-color: darken(#161A29, 10%) !important;
           }
         }
+
       }
     }
 
diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx
index a9dfe4c..4e93763 100644
--- a/src/page/Meeting/index.tsx
+++ b/src/page/Meeting/index.tsx
@@ -52,6 +52,12 @@ const Meeting: React.FC = () => {
         iconActive: ImageUrl.icon23Active,
         active: false,
       },
+      {
+        title: '申请发言',
+        icon: ImageUrl.icon47,
+        iconActive: ImageUrl.icon47Active,
+        active: false,
+      },
     ],
     [
       {
@@ -69,6 +75,11 @@ const Meeting: React.FC = () => {
         icon: ImageUrl.icon26,
         active: false,
       },
+      {
+        title: '会议监控',
+        icon: ImageUrl.icon48,
+        active: false,
+      },
       {
         title: '录制',
         icon: ImageUrl.icon27,
@@ -745,6 +756,21 @@ const Meeting: React.FC = () => {
       case '共享文件':
         sharedFilesModelRef.current.getData()
         break;
+      case '申请发言':
+        footerListTemplate[itemIndex][rowIndex].title = '结束发言'
+        footerListTemplate[itemIndex][rowIndex].active = true
+        setFooterList(footerListTemplate)
+        break;
+      case '结束发言':
+        footerListTemplate[itemIndex][rowIndex].title = '申请发言'
+        footerListTemplate[itemIndex][rowIndex].active = false
+        setFooterList(footerListTemplate)
+        break;
+      case '会议监控':
+        // window.electron.oepnWindow({
+        //   url: location.origin + '/#/userVideo'
+        // })
+        break;
     }
   }
   // 停止录制
diff --git a/src/utils/package/imageUrl.ts b/src/utils/package/imageUrl.ts
index 7cb3918..1fbb2cf 100644
--- a/src/utils/package/imageUrl.ts
+++ b/src/utils/package/imageUrl.ts
@@ -58,6 +58,9 @@ import icon44 from '@/assets/icon44.png'
 import icon45 from '@/assets/icon45.png'
 import icon45Active from '@/assets/icon45-active.png'
 import icon46 from '@/assets/icon46.png'
+import icon47 from '@/assets/icon47.png'
+import icon47Active from '@/assets/icon47-active.png'
+import icon48 from '@/assets/icon48.png'
 export default {
   error,
   icon,
@@ -119,4 +122,7 @@ export default {
   icon45,
   icon45Active,
   icon46,
+  icon47,
+  icon47Active,
+  icon48,
 }
\ No newline at end of file
diff --git a/src/utils/styles/App.scss b/src/utils/styles/App.scss
index 7ea98c2..27a6c31 100644
--- a/src/utils/styles/App.scss
+++ b/src/utils/styles/App.scss
@@ -346,4 +346,28 @@ $pagination-hover-background-color: #5575F2;
     border-color: $btn-background-color;
     background-color: $btn-background-color;
   }
+}
+
+// ant-notification
+.ant-notification {
+  .ant-notification-notice-wrapper {
+    background-color: #1F2022;
+
+    .ant-notification-notice-message {
+      color: white;
+    }
+
+    .ant-notification-notice-description {
+      color: white;
+    }
+
+    .ant-notification-notice-close {
+      color: #ccc;
+
+      &:hover {
+        color: white;
+        background-color: #0f0f10;
+      }
+    }
+  }
 }
\ No newline at end of file