weizhengliang 6 місяців тому
батько
коміт
3964e6a7e5

+ 1 - 1
android_mobile/src/main/yd_watch_2/code/com/wdkl/ncs/android/component/home/adapter/NewCallItemAdapter.kt

@@ -52,7 +52,7 @@ class NewCallItemAdapter(var data:ArrayList<CallingItem>, val activity: Activity
                     name = interactionVO.fromFrameFullName
                 }
 
-                binding.tvCallName.text = name + " " + StringUtil.getResString(R.string.str_call)
+                binding.tvCallName.text = name + "  " + StringUtil.getResString(R.string.str_call)
                 binding.btnCallAccept.setOnClickListener {
                     //来电接听
                     if (callListener != null) {

+ 3 - 3
android_mobile/src/main/yd_watch_2/code/com/wdkl/ncs/android/component/home/ui/FragmentAudio.java

@@ -214,9 +214,9 @@ public class FragmentAudio extends SingleCallFragment implements View.OnClickLis
             descTextView.setVisibility(View.GONE);
 
             muteLinearLayout.setVisibility(View.VISIBLE);
-            speakerLinearLayout.setVisibility(View.VISIBLE);
+            //speakerLinearLayout.setVisibility(View.VISIBLE);
 
-            isSpeakerOn = !isSpeakerOn;
+            /*isSpeakerOn = !isSpeakerOn;
             if (WebRTCEngine.getInstance().isHeadphonesPlugged()) {
                 Log.d(TAG, "didChangeState 耳机" + isSpeakerOn);
                 WebRTCEngine.getInstance().toggleHeadset(isSpeakerOn);
@@ -224,7 +224,7 @@ public class FragmentAudio extends SingleCallFragment implements View.OnClickLis
                 Log.d(TAG, "didChangeState 外放切换" + isSpeakerOn);
                 WebRTCEngine.getInstance().toggleSpeaker(isSpeakerOn);
                 speakerImageView.setSelected(isSpeakerOn);
-            }
+            }*/
 
             Room room = callSingleActivity.getRoom();
             StringBuilder sb = new StringBuilder(512);

+ 3 - 3
android_mobile/src/main/yd_watch_2/code/com/wdkl/ncs/android/component/home/ui/FragmentSipAudio.java

@@ -199,9 +199,9 @@ public class FragmentSipAudio extends BaseSipCallFragment implements View.OnClic
         RingPlayHelper.stopRingTone();
         SpeechUtil.getInstance().stopSpeak();
 
-        isSpeakerOn = !isSpeakerOn;
+        /*isSpeakerOn = !isSpeakerOn;
         Log.d(TAG, "didChangeState 外放切换" + isSpeakerOn);
-        callActivity.linphoneManager.enableSpeaker(isSpeakerOn);
+        callActivity.linphoneManager.enableSpeaker(isSpeakerOn);*/
 
         callActivity.linphoneManager.getCore().setPlaybackGainDb(2.0f);
         //Log.e(TAG, "playback gain: " + core.getPlaybackGainDb());
@@ -215,7 +215,7 @@ public class FragmentSipAudio extends BaseSipCallFragment implements View.OnClic
             descTextView.setVisibility(View.GONE);
 
             muteLinearLayout.setVisibility(View.VISIBLE);
-            speakerLinearLayout.setVisibility(View.VISIBLE);
+            //speakerLinearLayout.setVisibility(View.VISIBLE);
             speakerImageView.setSelected(isSpeakerOn);
             nameTextView.setText(getShowName());
 

+ 5 - 3
android_mobile/src/main/yd_watch_2/res/layout/fragment_audio.xml

@@ -15,7 +15,7 @@
 
     <LinearLayout
         android:id="@+id/lytParent"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
         android:gravity="center_horizontal"
@@ -30,17 +30,19 @@
 
         <TextView
             android:id="@+id/nameTextView"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="5dp"
+            android:gravity="center_horizontal"
             android:text=""
             android:textColor="@android:color/white" />
 
         <TextView
             android:id="@+id/descTextView"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="5dp"
+            android:gravity="center_horizontal"
             android:text=""
             android:textColor="@android:color/white" />
     </LinearLayout>