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();

69
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,12 +288,9 @@ class MeetingMainPageState extends State<MeetingMainPage> {
) )
: Container()), : Container()),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
GestureDetector( GestureDetector(
child: Container( child: Container(
width: 200.w, width: 180.w,
height: 40.h, height: 40.h,
margin: margin:
const EdgeInsets.only(left: 20, bottom: 40), const EdgeInsets.only(left: 20, bottom: 40),
@ -321,33 +334,6 @@ class MeetingMainPageState extends State<MeetingMainPage> {
.chatController.position.maxScrollExtent); .chatController.position.maxScrollExtent);
}); });
}, },
),
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),
),
),
onTap: () {
logic.cancelSpeak();
},
),
)
],
) )
], ],
), ),
@ -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,13 +757,8 @@ 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,
@ -802,13 +777,8 @@ 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]