marking
/
WGShare.Mobile.Flutter
19
0
Fork 0
Code Pull Requests Actions Releases Activity

Compare commits

base: marking:e1542212aad1ddaa14477c0b40adf0ed9f6a9063
Branches Tags
marking:master
marking:dev1.7
marking:dev
..
compare: marking:509372d214c88930597ea0f5ff6bea09af4e6e48
Branches Tags
marking:dev1.7
marking:master
marking:dev

No commits in common. "e1542212aad1ddaa14477c0b40adf0ed9f6a9063" and "509372d214c88930597ea0f5ff6bea09af4e6e48" have entirely different histories.
e1542212aa ... 509372d214

3 changed files with 69 additions and 104 deletions
Show Stats Expand all files Collapse all files

2
wgshare/lib/pages/metting/meeting_main_logic.dart
View File

@ -608,8 +608,6 @@ class MeetingMainLogic extends GetxController with RequestToolMixin {
// 打开用户音量回调 // 打开用户音量回调
await state.rctEngine.value?.enableAudioVolumeIndication( await state.rctEngine.value?.enableAudioVolumeIndication(
interval: 200, smooth: 3, reportVad: true); interval: 200, smooth: 3, reportVad: true);
// 在发送端设置双流模式并设置视频小流
await state.rctEngine.value?.setDualStreamMode(mode: SimulcastStreamMode.enableSimulcastStream);
joinMeetingToRtc(); joinMeetingToRtc();

169
wgshare/lib/pages/metting/meeting_main_view.dart
View File

@ -164,6 +164,22 @@ class MeetingMainPageState extends State<MeetingMainPage> {
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.end, mainAxisAlignment: MainAxisAlignment.end,
children: [ 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( GestureDetector(
child: Image.asset( child: Image.asset(
@ -272,82 +288,52 @@ class MeetingMainPageState extends State<MeetingMainPage> {
) )
: Container()), : Container()),
Row( GestureDetector(
mainAxisAlignment: MainAxisAlignment.spaceBetween, child: Container(
children: [ width: 180.w,
GestureDetector( height: 40.h,
child: Container( margin:
width: 200.w,
height: 40.h,
margin:
const EdgeInsets.only(left: 20, bottom: 40), const EdgeInsets.only(left: 20, bottom: 40),
padding: const EdgeInsets.only(left: 20), padding: const EdgeInsets.only(left: 20),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: const BorderRadius.only( borderRadius: const BorderRadius.only(
bottomLeft: Radius.circular(56), bottomLeft: Radius.circular(56),
topRight: Radius.circular(50), topRight: Radius.circular(50),
bottomRight: Radius.circular(50)), bottomRight: Radius.circular(50)),
color: ColorUtil.Color_35_35_35_07, color: ColorUtil.Color_35_35_35_07,
border: Border.all( border: Border.all(
width: 1.w, width: 1.w,
color: ColorUtil.Color_99_111_158), 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);
});
},
), ),
child: Row(
Visibility( crossAxisAlignment: CrossAxisAlignment.center,
visible: state.isSpeak.value, mainAxisAlignment: MainAxisAlignment.start,
child: GestureDetector( children: [
child: Container( Image.asset(
width: 82.w, 'assets/images/meeting_main_chat.png',
height: 40.h, width: 18.w,
margin: const EdgeInsets.only(left: 12, bottom: 40,right: 20), height: 18.h,
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),
),
), ),
onTap: () { SizedBox(width: 6.w),
logic.cancelSpeak(); 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( Expanded(
child: GestureDetector( child: Container(
child: Container( color: ColorUtil.Color_57_57_57_08,
color: ColorUtil.Color_57_57_57_08, ))
),
onTap: (){
logic.changeMeetingInfoState(false);
},
)
)
], ],
), ),
); );
@ -777,14 +757,9 @@ class MeetingMainPageState extends State<MeetingMainPage> {
child: Column( child: Column(
children: [ children: [
Expanded( Expanded(
child: GestureDetector( child: Container(
child: Container( color: ColorUtil.Color_57_57_57_08,
color: ColorUtil.Color_57_57_57_08, )),
),
onTap: (){
logic.changeMeetingAudioState(false);
},
)),
Container( Container(
color: ColorUtil.Color_57_57_57_08, color: ColorUtil.Color_57_57_57_08,
child: Container( child: Container(
@ -802,14 +777,9 @@ class MeetingMainPageState extends State<MeetingMainPage> {
), ),
), ),
Expanded( Expanded(
child: GestureDetector( child: Container(
child:Container( color: ColorUtil.Color_57_57_57_08,
color: ColorUtil.Color_57_57_57_08, ))
),
onTap: (){
logic.changeMeetingAudioState(false);
},
))
], ],
), ),
); );
@ -1509,8 +1479,7 @@ class MeetingMainPageState extends State<MeetingMainPage> {
rtcEngine: state.rctEngine.value!, rtcEngine: state.rctEngine.value!,
canvas: VideoCanvas( canvas: VideoCanvas(
uid: int.tryParse(state.remoteUid.value), uid: int.tryParse(state.remoteUid.value),
setupMode: VideoViewSetupMode.videoViewSetupAdd, setupMode: VideoViewSetupMode.videoViewSetupAdd),
renderMode: state.remoteUid.value.length == 9 ? RenderModeType.renderModeFit : RenderModeType.renderModeHidden),
), ),
) )
: Container( : Container(

2
wgshare/lib/utils/color_util.dart
View File

@ -71,8 +71,6 @@ class ColorUtil {
static const Color_16_19_13 = Color.fromRGBO(16, 19, 13, 1); 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, /// hex, 十六进制值，例如：0xffffff,
/// alpha, 透明度 [0.0,1.0] /// alpha, 透明度 [0.0,1.0]