Compare commits
No commits in common. "e1542212aad1ddaa14477c0b40adf0ed9f6a9063" and "509372d214c88930597ea0f5ff6bea09af4e6e48" have entirely different histories.
e1542212aa
...
509372d214
|
|
@ -608,8 +608,6 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
|
|||
// 打开用户音量回调
|
||||
await state.rctEngine.value?.enableAudioVolumeIndication(
|
||||
interval: 200, smooth: 3, reportVad: true);
|
||||
// 在发送端设置双流模式并设置视频小流
|
||||
await state.rctEngine.value?.setDualStreamMode(mode: SimulcastStreamMode.enableSimulcastStream);
|
||||
|
||||
joinMeetingToRtc();
|
||||
|
||||
|
|
|
|||
|
|
@ -164,6 +164,22 @@ class MeetingMainPageState extends State<MeetingMainPage> {
|
|||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.end,
|
||||
children: [
|
||||
/// 结束发言
|
||||
Visibility(
|
||||
visible: state.isSpeak.value,
|
||||
child: GestureDetector(
|
||||
child: Image.asset(
|
||||
'assets/images/meeting_main_hang_up.png',
|
||||
width: 22.w,
|
||||
height: 22.h,
|
||||
),
|
||||
onTap: () {
|
||||
logic.cancelSpeak();
|
||||
},
|
||||
),
|
||||
),
|
||||
SizedBox(width: 16.w),
|
||||
|
||||
/// 退出会议
|
||||
GestureDetector(
|
||||
child: Image.asset(
|
||||
|
|
@ -272,82 +288,52 @@ class MeetingMainPageState extends State<MeetingMainPage> {
|
|||
)
|
||||
: Container()),
|
||||
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
GestureDetector(
|
||||
child: Container(
|
||||
width: 200.w,
|
||||
height: 40.h,
|
||||
margin:
|
||||
GestureDetector(
|
||||
child: Container(
|
||||
width: 180.w,
|
||||
height: 40.h,
|
||||
margin:
|
||||
const EdgeInsets.only(left: 20, bottom: 40),
|
||||
padding: const EdgeInsets.only(left: 20),
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: const BorderRadius.only(
|
||||
bottomLeft: Radius.circular(56),
|
||||
topRight: Radius.circular(50),
|
||||
bottomRight: Radius.circular(50)),
|
||||
color: ColorUtil.Color_35_35_35_07,
|
||||
border: Border.all(
|
||||
width: 1.w,
|
||||
color: ColorUtil.Color_99_111_158),
|
||||
),
|
||||
child: Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
mainAxisAlignment: MainAxisAlignment.start,
|
||||
children: [
|
||||
Image.asset(
|
||||
'assets/images/meeting_main_chat.png',
|
||||
width: 18.w,
|
||||
height: 18.h,
|
||||
),
|
||||
SizedBox(width: 6.w),
|
||||
Text(
|
||||
'说点什么...',
|
||||
style: TextStyle(
|
||||
fontSize: 14.sp,
|
||||
color: ColorUtil.Color_156_156_156),
|
||||
)
|
||||
],
|
||||
),
|
||||
),
|
||||
onTap: () {
|
||||
Get.bottomSheet(
|
||||
isScrollControlled: true,
|
||||
chatBottomSheet(context));
|
||||
Future.delayed(const Duration(milliseconds: 100),
|
||||
() {
|
||||
state.chatController.jumpTo(state
|
||||
.chatController.position.maxScrollExtent);
|
||||
});
|
||||
},
|
||||
padding: const EdgeInsets.only(left: 20),
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: const BorderRadius.only(
|
||||
bottomLeft: Radius.circular(56),
|
||||
topRight: Radius.circular(50),
|
||||
bottomRight: Radius.circular(50)),
|
||||
color: ColorUtil.Color_35_35_35_07,
|
||||
border: Border.all(
|
||||
width: 1.w,
|
||||
color: ColorUtil.Color_99_111_158),
|
||||
),
|
||||
|
||||
Visibility(
|
||||
visible: state.isSpeak.value,
|
||||
child: GestureDetector(
|
||||
child: Container(
|
||||
width: 82.w,
|
||||
height: 40.h,
|
||||
margin: const EdgeInsets.only(left: 12, bottom: 40,right: 20),
|
||||
alignment: Alignment.center,
|
||||
decoration: const BoxDecoration(
|
||||
borderRadius: BorderRadius.all(Radius.circular(99)),
|
||||
color: ColorUtil.Color_255_69_69
|
||||
),
|
||||
child: Text(
|
||||
'结束发言',
|
||||
style: TextStyle(
|
||||
fontSize: 14.sp,
|
||||
color: ColorUtil.Color_255_255_255),
|
||||
),
|
||||
child: Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
mainAxisAlignment: MainAxisAlignment.start,
|
||||
children: [
|
||||
Image.asset(
|
||||
'assets/images/meeting_main_chat.png',
|
||||
width: 18.w,
|
||||
height: 18.h,
|
||||
),
|
||||
onTap: () {
|
||||
logic.cancelSpeak();
|
||||
},
|
||||
),
|
||||
)
|
||||
],
|
||||
SizedBox(width: 6.w),
|
||||
Text(
|
||||
'说点什么...',
|
||||
style: TextStyle(
|
||||
fontSize: 14.sp,
|
||||
color: ColorUtil.Color_156_156_156),
|
||||
)
|
||||
],
|
||||
),
|
||||
),
|
||||
onTap: () {
|
||||
Get.bottomSheet(
|
||||
isScrollControlled: true,
|
||||
chatBottomSheet(context));
|
||||
Future.delayed(const Duration(milliseconds: 100),
|
||||
() {
|
||||
state.chatController.jumpTo(state
|
||||
.chatController.position.maxScrollExtent);
|
||||
});
|
||||
},
|
||||
)
|
||||
],
|
||||
),
|
||||
|
|
@ -756,15 +742,9 @@ class MeetingMainPageState extends State<MeetingMainPage> {
|
|||
),
|
||||
),
|
||||
Expanded(
|
||||
child: GestureDetector(
|
||||
child: Container(
|
||||
color: ColorUtil.Color_57_57_57_08,
|
||||
),
|
||||
onTap: (){
|
||||
logic.changeMeetingInfoState(false);
|
||||
},
|
||||
)
|
||||
)
|
||||
child: Container(
|
||||
color: ColorUtil.Color_57_57_57_08,
|
||||
))
|
||||
],
|
||||
),
|
||||
);
|
||||
|
|
@ -777,14 +757,9 @@ class MeetingMainPageState extends State<MeetingMainPage> {
|
|||
child: Column(
|
||||
children: [
|
||||
Expanded(
|
||||
child: GestureDetector(
|
||||
child: Container(
|
||||
color: ColorUtil.Color_57_57_57_08,
|
||||
),
|
||||
onTap: (){
|
||||
logic.changeMeetingAudioState(false);
|
||||
},
|
||||
)),
|
||||
child: Container(
|
||||
color: ColorUtil.Color_57_57_57_08,
|
||||
)),
|
||||
Container(
|
||||
color: ColorUtil.Color_57_57_57_08,
|
||||
child: Container(
|
||||
|
|
@ -802,14 +777,9 @@ class MeetingMainPageState extends State<MeetingMainPage> {
|
|||
),
|
||||
),
|
||||
Expanded(
|
||||
child: GestureDetector(
|
||||
child:Container(
|
||||
color: ColorUtil.Color_57_57_57_08,
|
||||
),
|
||||
onTap: (){
|
||||
logic.changeMeetingAudioState(false);
|
||||
},
|
||||
))
|
||||
child: Container(
|
||||
color: ColorUtil.Color_57_57_57_08,
|
||||
))
|
||||
],
|
||||
),
|
||||
);
|
||||
|
|
@ -1509,8 +1479,7 @@ class MeetingMainPageState extends State<MeetingMainPage> {
|
|||
rtcEngine: state.rctEngine.value!,
|
||||
canvas: VideoCanvas(
|
||||
uid: int.tryParse(state.remoteUid.value),
|
||||
setupMode: VideoViewSetupMode.videoViewSetupAdd,
|
||||
renderMode: state.remoteUid.value.length == 9 ? RenderModeType.renderModeFit : RenderModeType.renderModeHidden),
|
||||
setupMode: VideoViewSetupMode.videoViewSetupAdd),
|
||||
),
|
||||
)
|
||||
: Container(
|
||||
|
|
|
|||
|
|
@ -71,8 +71,6 @@ class ColorUtil {
|
|||
|
||||
static const Color_16_19_13 = Color.fromRGBO(16, 19, 13, 1);
|
||||
|
||||
static const Color_255_69_69 = Color.fromRGBO(255, 69, 69, 1);
|
||||
|
||||
/// 十六进制颜色，
|
||||
/// hex, 十六进制值，例如：0xffffff,
|
||||
/// alpha, 透明度 [0.0,1.0]
|
||||
|
|
|
|||
Loading…
Reference in New Issue