Browse Source

呼叫优化

weizhengliang 3 years ago
parent
commit
6cd35fb547

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

@@ -93,7 +93,7 @@ class TakeoverItemAdapter(var data:ArrayList<JsonObject>, val context: Context)
             } else {
             } else {
                 binding.btnUserChange.visibility = View.GONE
                 binding.btnUserChange.visibility = View.GONE
                 binding.btnCallOut.setOnClickListener {
                 binding.btnCallOut.setOnClickListener {
-                    DeviceChannel.calling = true
+                    //DeviceChannel.calling = true
 
 
                     if (Constants.phoneType == CommunicationEnum.MOBILE_PHONE.value()) {
                     if (Constants.phoneType == CommunicationEnum.MOBILE_PHONE.value()) {
                         try {
                         try {

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

@@ -109,6 +109,8 @@ public class CallSingleActivity extends AppCompatActivity {
         setStatusBarOrScreenStatus(this);
         setStatusBarOrScreenStatus(this);
         setContentView(R.layout.activity_single_call);
         setContentView(R.layout.activity_single_call);
 
 
+        DeviceChannel.calling = true;
+
         mVibrator = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
         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);
 
 

+ 1 - 1
home/src/main/code/com/wdkl/ncs/android/component/home/ui/SingleCallFragment.java

@@ -114,7 +114,7 @@ public abstract class SingleCallFragment extends Fragment {
         if (isOutgoing) {
         if (isOutgoing) {
             RingPlayHelper.playRingTone(BaseApplication.appContext, R.raw.ring_back2, true);
             RingPlayHelper.playRingTone(BaseApplication.appContext, R.raw.ring_back2, true);
         } else {
         } else {
-            RingPlayHelper.playRingTone(BaseApplication.appContext, R.raw.incoming_call, true);
+            RingPlayHelper.playRingTone(BaseApplication.appContext, R.raw.ring_tone, true);
         }
         }
     }
     }
 
 

BIN
resource/src/main/res/raw/ring_tone.mp3