Browse Source

通话界面显示优化

weizhengliang 3 năm trước cách đây
mục cha
commit
1a1fad934b

+ 2 - 1
home/src/main/AndroidManifest.xml

@@ -51,7 +51,8 @@
             android:showOnLockScreen="true"
             android:showWhenLocked="true"
             android:launchMode="singleInstance"
-            android:excludeFromRecents="true">
+            android:excludeFromRecents="true"
+            android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="${applicationId}.kit.voip.single" />
                 <category android:name="android.intent.category.DEFAULT" />

+ 4 - 4
home/src/main/code/com/wdkl/ncs/android/component/home/ui/CallSingleActivity.java

@@ -85,7 +85,7 @@ public class CallSingleActivity extends AppCompatActivity {
     private SingleCallFragment currentFragment;
     //振动
     Vibrator mVibrator;
-    public LoadingDialog loadingDialog;
+    //public LoadingDialog loadingDialog;
 
     private boolean mServiceBound = false;
     private HomeWatcher mHomeWatcher;
@@ -114,7 +114,7 @@ public class CallSingleActivity extends AppCompatActivity {
         DeviceChannel.calling = true;
 
         mVibrator = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
-        loadingDialog = CommonTool.createLoadingDialog(this, R.layout.custom_loading,R.id.loadding_image);
+        //loadingDialog = CommonTool.createLoadingDialog(this, R.layout.custom_loading,R.id.loadding_image);
 
         final Intent intent = getIntent();
         roomId = new BigInteger(intent.getStringExtra(EXTRA_ROOM_ID));
@@ -413,9 +413,9 @@ public class CallSingleActivity extends AppCompatActivity {
             janusClient.disConnect();
         }
 
-        if (loadingDialog != null) {
+        /*if (loadingDialog != null) {
             loadingDialog.dismiss();
-        }
+        }*/
 
         if (mVibrator != null) {
             mVibrator.cancel();

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

@@ -75,9 +75,9 @@ public class FragmentAudio extends SingleCallFragment implements View.OnClickLis
     public void init() {
         super.init();
 
-        if (callSingleActivity.loadingDialog==null){
+        /*if (callSingleActivity.loadingDialog==null){
             callSingleActivity.loadingDialog = CommonTool.createLoadingDialog(this.getContext(), R.layout.custom_loading,R.id.loadding_image);
-        }
+        }*/
         InteractionVO interactionVO = null;
         if (callSingleActivity.recTcpModel.getData()!=null) {
             interactionVO = new Gson().fromJson(callSingleActivity.recTcpModel.getData().toString(), InteractionVO.class);
@@ -201,7 +201,7 @@ public class FragmentAudio extends SingleCallFragment implements View.OnClickLis
         RingPlayHelper.stopRingTone();
 
         runOnUiThread(() -> {
-            callSingleActivity.loadingDialog.dismiss();
+            //callSingleActivity.loadingDialog.dismiss();
 
             incomingActionContainer.setVisibility(View.GONE);
             outgoingActionContainer.setVisibility(View.VISIBLE);
@@ -264,7 +264,7 @@ public class FragmentAudio extends SingleCallFragment implements View.OnClickLis
 
     @SuppressLint("CheckResult")
     private void transCall(){
-        callSingleActivity.loadingDialog.show();
+        //callSingleActivity.loadingDialog.show();
         MediaPlayHelper.getInstance().stopMusic(true);
         RingPlayHelper.stopRingTone();
 
@@ -295,7 +295,7 @@ public class FragmentAudio extends SingleCallFragment implements View.OnClickLis
             //transHandler = null;
             accepted = true;
 
-            callSingleActivity.loadingDialog.show();
+            //callSingleActivity.loadingDialog.show();
             callSingleActivity.janusClient.connect();
             callSingleActivity.mVibrator.cancel();
             MediaPlayHelper.getInstance().stopMusic(true);
@@ -314,7 +314,7 @@ public class FragmentAudio extends SingleCallFragment implements View.OnClickLis
                     Log.d(TAG, "TCP.发送消息完成");
                 } else {
                     Log.e(TAG, "TCP.发送消息失败");
-                    callSingleActivity.loadingDialog.dismiss();
+                    //callSingleActivity.loadingDialog.dismiss();
                     HandleTcpConnect.Companion.getInstance().tcpReConnectWithMsgShow();
                 }
             });

+ 1 - 1
janus/src/main/java/com/wdkl/rtc/rtc/WebRTCEngine.java

@@ -518,7 +518,7 @@ public class WebRTCEngine {
             if (enable) {
                 if (!setBluetoothHeadsetOn()) {   //优先蓝牙
                     audioManager.setStreamVolume(AudioManager.MODE_IN_COMMUNICATION,
-                            audioManager.getStreamMaxVolume(AudioManager.MODE_IN_COMMUNICATION),
+                            audioManager.getStreamVolume(AudioManager.MODE_IN_COMMUNICATION),
                             AudioManager.FX_KEY_CLICK);
                     audioManager.setSpeakerphoneOn(true);
                 }