From c838e63e6a0fd8e6e24efdf782a72f75b1ebde2b Mon Sep 17 00:00:00 2001
From: linminjie <1004644107@qq.com>
Date: Fri, 4 Aug 2023 15:13:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E9=A2=91=E4=BC=9A=E8=AE=AE=E7=84=A6?=
 =?UTF-8?q?=E7=82=B9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml                   |   1 -
 .../unionmedtv/meeting/MeetMemberAdapter.java      |  16 ++-
 .../unionmedtv/meeting/MeetingActivity.java        |   6 +-
 .../main/res/layout/activity_meeting1_v1_main.xml  | 142 ++++++++++++++-------
 app/src/main/res/layout/meet_member_item.xml       |   2 +-
 5 files changed, 110 insertions(+), 57 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0999b80..fb4abe4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -108,7 +108,6 @@
             android:screenOrientation="landscape" />
         <activity
             android:name=".activity.MsgDetailActivity"
-            android:theme="@style/TranslucentTheme"
             android:screenOrientation="landscape" />
 
         <meta-data
diff --git a/app/src/main/java/com/unionmed/unionmedtv/meeting/MeetMemberAdapter.java b/app/src/main/java/com/unionmed/unionmedtv/meeting/MeetMemberAdapter.java
index 93b629a..559bfff 100644
--- a/app/src/main/java/com/unionmed/unionmedtv/meeting/MeetMemberAdapter.java
+++ b/app/src/main/java/com/unionmed/unionmedtv/meeting/MeetMemberAdapter.java
@@ -7,6 +7,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -98,15 +99,22 @@ public class MeetMemberAdapter extends RecyclerView.Adapter<MeetMemberAdapter.Vi
             holder.iv_userPhoto.setVisibility(View.GONE);
 
         }
-
-        holder.view_item.setOnClickListener(new View.OnClickListener() {
+        holder.relative.setOnClickListener(new View.OnClickListener() {
             @Override
-            public void onClick(View v) {
+            public void onClick(View view) {
                 if (null != mListener) {
                     mListener.onItemClick(meetingModel, position);
                 }
             }
         });
+//        holder.view_item.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                if (null != mListener) {
+//                    mListener.onItemClick(meetingModel, position);
+//                }
+//            }
+//        });
 
 
         if (meetingModel.isVoiceDisable()) {
@@ -132,6 +140,7 @@ public class MeetMemberAdapter extends RecyclerView.Adapter<MeetMemberAdapter.Vi
         TextView tv_userName;
         ImageView iv_userPhoto;
         ImageView iv_voice;
+        RelativeLayout relative;
 
         public ViewHolder(View itemView) {
             super(itemView);
@@ -140,6 +149,7 @@ public class MeetMemberAdapter extends RecyclerView.Adapter<MeetMemberAdapter.Vi
             iv_userPhoto = itemView.findViewById(R.id.iv_userPhoto);
             iv_voice = itemView.findViewById(R.id.iv_voice);
             view_item = itemView.findViewById(R.id.view_item);
+            relative = itemView.findViewById(R.id.relative);
         }
     }
 
diff --git a/app/src/main/java/com/unionmed/unionmedtv/meeting/MeetingActivity.java b/app/src/main/java/com/unionmed/unionmedtv/meeting/MeetingActivity.java
index 6e3619f..c4b2e45 100644
--- a/app/src/main/java/com/unionmed/unionmedtv/meeting/MeetingActivity.java
+++ b/app/src/main/java/com/unionmed/unionmedtv/meeting/MeetingActivity.java
@@ -175,7 +175,7 @@ public class MeetingActivity extends BaseActivity implements MeetingPresenter.Me
 
     @SuppressLint("UseCompatLoadingForDrawables")
     public void click(View view) {
-        if (view.getId() == R.id.btn_leave) {
+        if (view.getId() == R.id.btn_leave||view.getId()==R.id.lin_hang_up) {
             RCRTCEngine.getInstance().leaveRoom(new IRCRTCResultCallback() {
                 @Override
                 public void onSuccess() {
@@ -188,7 +188,7 @@ public class MeetingActivity extends BaseActivity implements MeetingPresenter.Me
                 }
             });
             finish();
-        } else if (view.getId() == R.id.btn_mic) {
+        } else if (view.getId() == R.id.btn_mic||view.getId()==R.id.lin_mute) {
             // 设置禁用麦克风采集
             if (RCRTCEngine.getInstance().getDefaultAudioStream().isMicrophoneDisable()) {
                 RCRTCEngine.getInstance().getDefaultAudioStream().setMicrophoneDisable(false);
@@ -218,7 +218,7 @@ public class MeetingActivity extends BaseActivity implements MeetingPresenter.Me
                     }
                 }
             }
-        } else if (view.getId() == R.id.btn_camera) {
+        } else if (view.getId() == R.id.btn_camera||view.getId()==R.id.lin_camera) {
             if (cameraOpen) {
                 RCRTCEngine.getInstance().getDefaultVideoStream().stopCamera();
                 btn_camera.setImageResource(R.mipmap.icon_camera_off);
diff --git a/app/src/main/res/layout/activity_meeting1_v1_main.xml b/app/src/main/res/layout/activity_meeting1_v1_main.xml
index e3ef096..358ef3b 100644
--- a/app/src/main/res/layout/activity_meeting1_v1_main.xml
+++ b/app/src/main/res/layout/activity_meeting1_v1_main.xml
@@ -44,11 +44,7 @@
             android:layout_centerInParent="true" />
 
     </RelativeLayout>
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recycleview"
-        android:layout_width="match_parent"
-        android:layout_height="200dp"
-        android:layout_above="@+id/rel_btn" />
+
 
 
     <FrameLayout
@@ -81,67 +77,115 @@
         android:layout_alignParentBottom="true"
         android:layout_marginBottom="45dp">
 
-        <Button
-            android:id="@+id/btn_leave"
-            android:layout_width="60dp"
-            android:layout_height="60dp"
-            android:layout_centerHorizontal="true"
-            android:background="@mipmap/icon_hang_up"
-            android:onClick="click" />
-
-        <TextView
-            android:layout_width="60dp"
+        <LinearLayout
+            android:id="@+id/lin_hang_up"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/btn_leave"
-            android:layout_alignLeft="@+id/btn_leave"
-            android:layout_marginTop="10dp"
-            android:gravity="center_horizontal"
-            android:text="挂断"
-            android:textColor="#ffffff"
-            android:textSize="10sp" />
-
-        <ImageView
-            android:id="@+id/btn_camera"
-            android:layout_width="60dp"
-            android:layout_height="60dp"
-            android:layout_marginLeft="15dp"
-            android:layout_toRightOf="@+id/btn_leave"
-            android:background="@null"
+            android:layout_marginRight="84dp"
+            android:background="@drawable/bg_focus_selector_10"
+            android:clickable="true"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:nextFocusLeft="@+id/lin_hang_up"
             android:onClick="click"
-            android:src="@mipmap/icon_camera_on" />
-
-        <TextView
-            android:id="@+id/tv_camera"
-            android:layout_width="60dp"
+            android:orientation="vertical"
+            android:padding="@dimen/dp_10">
+
+            <Button
+                android:id="@+id/btn_leave"
+                android:layout_width="60dp"
+                android:layout_height="60dp"
+                android:layout_centerHorizontal="true"
+                android:background="@mipmap/icon_hang_up"
+                android:onClick="click" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/btn_leave"
+                android:layout_alignLeft="@+id/btn_leave"
+                android:layout_marginTop="10dp"
+                android:gravity="center_horizontal"
+                android:text="挂断"
+                android:textColor="#ffffff"
+                android:textSize="10sp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/lin_camera"
+            android:padding="@dimen/dp_10"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/btn_camera"
-            android:layout_alignLeft="@+id/btn_camera"
-            android:layout_marginTop="10dp"
-            android:gravity="center_horizontal"
-            android:text="摄像头已开"
-            android:textColor="#ffffff"
-            android:textSize="10sp" />
-
+            android:layout_marginRight="84dp"
+            android:layout_toRightOf="@+id/lin_hang_up"
+            android:background="@drawable/bg_focus_selector_10"
+            android:clickable="true"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:onClick="click"
+            android:orientation="vertical">
+            <ImageView
+                android:id="@+id/btn_camera"
+                android:layout_width="60dp"
+                android:layout_height="60dp"
+                android:background="@null"
+                android:onClick="click"
+                android:src="@mipmap/icon_camera_on" />
+
+            <TextView
+                android:id="@+id/tv_camera"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/btn_camera"
+                android:layout_alignLeft="@+id/btn_camera"
+                android:layout_marginTop="10dp"
+                android:gravity="center_horizontal"
+                android:text="摄像头已开"
+                android:textColor="#ffffff"
+                android:textSize="10sp" />
+        </LinearLayout>
+        <LinearLayout
+            android:id="@+id/lin_mute"
+            android:padding="@dimen/dp_10"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toRightOf="@+id/lin_camera"
+            android:layout_marginRight="84dp"
+            android:background="@drawable/bg_focus_selector_10"
+            android:clickable="true"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:nextFocusRight="@+id/lin_mute"
+            android:onClick="click"
+            android:orientation="vertical">
         <Button
             android:id="@+id/btn_mic"
             android:layout_width="60dp"
             android:layout_height="60dp"
-            android:layout_marginLeft="15dp"
             android:layout_toRightOf="@+id/btn_camera"
-            android:background="@mipmap/icon_mute_on"
-            android:onClick="click" />
+            android:onClick="click"
+            android:background="@mipmap/icon_mute_on" />
 
         <TextView
             android:id="@+id/tv_mic"
-            android:layout_width="60dp"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/btn_mic"
             android:layout_alignLeft="@+id/btn_mic"
             android:layout_marginTop="10dp"
-            android:gravity="center_horizontal"
+            android:gravity="center"
             android:text="语音已开"
             android:textColor="#ffffff"
             android:textSize="10sp" />
-
+        </LinearLayout>
     </RelativeLayout>
+    <androidx.recyclerview.widget.RecyclerView
+        android:focusable="false"
+        android:focusableInTouchMode="false"
+        android:id="@+id/recycleview"
+        android:layout_width="match_parent"
+        android:layout_height="200dp"
+        android:layout_marginBottom="20dp"
+        android:layout_above="@+id/rel_btn"
+        />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/meet_member_item.xml b/app/src/main/res/layout/meet_member_item.xml
index 0643ec0..079dd60 100644
--- a/app/src/main/res/layout/meet_member_item.xml
+++ b/app/src/main/res/layout/meet_member_item.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/relative"
     android:layout_width="200dp"
     android:layout_height="200dp"
     android:padding="10dp"
     android:layout_marginLeft="10dp"
     android:background="@drawable/edit_phone_select"
-    android:descendantFocusability="afterDescendants"
     style="@style/FocusStyle"
     android:orientation="vertical">