Skip to content

Commit

Permalink
调整会议UI
Browse files Browse the repository at this point in the history
  • Loading branch information
@imhao183
imhao183 committed Feb 17, 2021
1 parent f460d37 commit c8e57a7
Show file tree
Hide file tree
Showing 3 changed files with 212 additions and 2 deletions.
5 changes: 3 additions & 2 deletions uikit/src/main/java/cn/wildfire/chat/kit/voip/conference/ConferenceVideoFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;

Expand Down Expand Up @@ -47,7 +48,7 @@

public class ConferenceVideoFragment extends Fragment implements AVEngineKit.CallSessionCallback {
@BindView(R2.id.rootView)
LinearLayout rootLinearLayout;
RelativeLayout rootLinearLayout;
@BindView(R2.id.durationTextView)
TextView durationTextView;
@BindView(R2.id.videoContainerGridLayout)
Expand Down Expand Up @@ -76,7 +77,7 @@ public class ConferenceVideoFragment extends Fragment implements AVEngineKit.Cal
@Nullable
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.av_multi_video_outgoing_connected, container, false);
View view = inflater.inflate(R.layout.av_conference_connected, container, false);
ButterKnife.bind(this, view);
init();
return view;
Expand Down
73 changes: 73 additions & 0 deletions uikit/src/main/res-av/layout/av_conference_connected.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/rootView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray"
android:orientation="vertical">

<LinearLayout
android:id="@+id/topBarView"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_alignParentLeft="true"
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
android:orientation="horizontal">

<ImageView
android:id="@+id/minimizeImageView"
android:layout_width="50dp"
android:layout_height="50dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:src="@drawable/av_minimize"
android:tint="@color/white" />

<View
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1" />

<ImageView
android:id="@+id/switchCameraImageView"
android:layout_width="50dp"
android:layout_height="50dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:src="@drawable/av_switch_camera_selector"
android:tint="@color/white" />

</LinearLayout>

<FrameLayout
android:layout_below="@id/topBarView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:visibility="visible">

<FrameLayout
android:id="@+id/focusVideoContainerFrameLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/green1" />


<androidx.gridlayout.widget.GridLayout
android:id="@+id/videoContainerGridLayout"
android:layout_width="match_parent"
android:layout_height="400dp"
android:layout_gravity="center"
android:animateLayoutChanges="true"
app:alignmentMode="alignBounds"
app:columnCount="3"
app:orientation="horizontal"
app:rowCount="3"
app:useDefaultMargins="false" />
</FrameLayout>

<include layout="@layout/av_conference_connected_action" />

</RelativeLayout>
136 changes: 136 additions & 0 deletions uikit/src/main/res-av/layout/av_conference_connected_action.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:background="@color/gray"
android:gravity="center"
android:orientation="vertical">

<TextView
android:id="@+id/durationTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="00:00"
android:textColor="@color/white" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:orientation="horizontal">

<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">

<ImageView
android:id="@+id/muteImageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/av_conference_audio" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="静音"
android:textColor="@color/white" />

</LinearLayout>

<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">

<ImageView
android:id="@+id/videoImageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/av_conference_video" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="视频"
android:textColor="@color/white" />

</LinearLayout>

<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">

<ImageView
android:id="@+id/shareScreenImageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/av_conference_screen_sharing" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="共享屏幕"
android:textColor="@color/white" />

</LinearLayout>

<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">

<ImageView
android:id="@+id/addParticipantImageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/av_conference_members" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="管理(2)"
android:textColor="@color/white" />

</LinearLayout>

<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">

<ImageView
android:id="@+id/hangupImageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/av_conference_end_call" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="结束"
android:textColor="@color/white" />

</LinearLayout>
</LinearLayout>

</LinearLayout>

0 comments on commit c8e57a7

Please sign in to comment.